• 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
Name
Last commit
Last update
..
aac.mak Loading commit data...
ac3.mak Loading commit data...
adpcm.mak Loading commit data...
als.mak Loading commit data...
amrnb.mak Loading commit data...
amrwb.mak Loading commit data...
atrac.mak Loading commit data...
audio.mak Loading commit data...
cdxl.mak Loading commit data...
dct.mak Loading commit data...
demux.mak Loading commit data...
dfa.mak Loading commit data...
dpcm.mak Loading commit data...
ea.mak Loading commit data...
fft.mak Loading commit data...
h264.mak Loading commit data...
image.mak Loading commit data...
indeo.mak Loading commit data...
libavcodec.mak Loading commit data...
libavutil.mak Loading commit data...
lossless-audio.mak Loading commit data...
lossless-video.mak Loading commit data...
mapchan.mak Loading commit data...
microsoft.mak Loading commit data...
mp3.mak Loading commit data...
mpc.mak Loading commit data...
pcm.mak Loading commit data...
prores.mak Loading commit data...
qt.mak Loading commit data...
qtrle.mak Loading commit data...
real.mak Loading commit data...
screen.mak Loading commit data...
utvideo.mak Loading commit data...
video.mak Loading commit data...
voice.mak Loading commit data...
vorbis.mak Loading commit data...
vpx.mak Loading commit data...
vqf.mak Loading commit data...
wavpack.mak Loading commit data...
wma.mak Loading commit data...