Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 17 Mar 2012 22:16:05 +0000 (23:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 17 Mar 2012 22:16:05 +0000 (23:16 +0100)
commit967bdb8572f27b9891fe7bd9b8489146a906633d
tree61b486be897a4503f71e2ecc7734f16930dc1a94
parent219a6fb61cb9e6f534f20dc3313442f89b0ffd42
parent6ca3b248e21fc48418c4221fc92c2eecaf07cb9b
Merge remote-tracking branch 'qatar/master'

* 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: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c
libavcodec/mimic.c
libavcodec/mpegvideo.c
libavcodec/pthread.c
libavcodec/qtrle.c
libavcodec/resample.c
libavcodec/vqavideo.c
libavcodec/wmaenc.c
libavdevice/x11grab.c
tests/codec-regression.sh
tests/fate-run.sh