• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 967bdb85
    Michael Niedermayer authored
    * qatar/master:
      resample: allocate a large enough output buffer
      fate: fix enc_dec_pcm tests with remote target
      wmaenc: remove bit-exact hack
      FATE: remove WMA acodec tests
      FATE: add WMAv1 and WMAv2 encode/decode tests with fuzzy comparison
      FATE: add AC-3 and E-AC-3 encode/decode tests with fuzzy comparison
      qtrle: Use bytestream2 functions to prevent buffer overreads.
      vqavideo: check malloc return values
      x11grab: fix a memory leak exposed by valgrind
      threads: fix old frames returned after avcodec_flush_buffers()
      MPV: always mark dummy frames as reference
      h264: fix deadlocks on incomplete reference frame decoding.
      mpeg4: report frame decoding completion at ff_MPV_frame_end().
      mimic: don't use self as reference, and report completion at end of decode().
    
    Conflicts:
    	libavcodec/h264.c
    	libavcodec/qtrle.c
    	libavcodec/resample.c
    	libavcodec/vqavideo.c
    	libavdevice/x11grab.c
    	tests/ref/seek/wmav1_asf
    	tests/ref/seek/wmav2_asf
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    967bdb85
resample.c 13.9 KB