Michael Niedermayer
967bdb8572
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>
2012-03-17 23:16:05 +01:00
..
2012-02-02 14:31:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2012-03-05 13:08:17 -05:00
2010-07-20 10:09:54 +00:00
2011-10-14 13:28:58 +02:00
2012-02-11 16:41:01 -05:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2012-02-26 07:30:21 +01:00
2012-02-26 07:30:21 +01:00
2010-07-20 10:09:54 +00:00
2011-05-02 18:38:01 +02:00
2011-05-02 18:38:01 +02:00
2011-05-02 18:38:01 +02:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2011-11-02 10:43:39 +01:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2011-10-14 13:28:58 +02:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2011-12-12 21:54:52 +01:00
2010-07-20 10:09:54 +00:00
2012-02-07 20:11:11 +01:00
2011-05-02 18:38:01 +02:00
2011-09-08 20:53:37 +02:00
2011-12-12 21:54:52 +01:00
2011-07-08 19:58:19 +02:00
2010-07-20 10:09:54 +00:00
2012-02-13 21:48:20 +01:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2012-03-16 21:27:23 +01:00
2012-01-22 14:40:53 +01:00
2012-01-22 14:40:53 +01:00
2011-12-12 21:54:52 +01:00
2011-12-12 21:54:52 +01:00
2012-02-07 20:11:11 +01:00
2010-07-20 10:09:54 +00:00
2012-02-11 23:57:35 +01:00
2010-07-20 10:09:54 +00:00
2012-03-03 17:03:27 -05:00
2011-10-14 13:28:58 +02:00
2012-03-09 19:36:12 +01:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2012-03-03 17:03:26 -05:00
2012-02-26 07:30:21 +01:00
2012-02-26 07:30:21 +01:00
2012-02-26 07:30:21 +01:00
2012-02-26 07:30:21 +01:00
2012-02-26 07:30:21 +01:00
2012-02-26 07:30:21 +01:00
2011-09-28 02:30:30 +01:00
2012-02-26 07:30:21 +01:00
2012-02-26 07:30:21 +01:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2011-10-14 13:28:58 +02:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2011-10-14 13:28:58 +02:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2011-10-14 13:28:58 +02:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2011-10-14 13:28:58 +02:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-09-26 09:02:51 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00