Michael Niedermayer
61930bd0d7
Merge remote-tracking branch 'qatar/master'
...
* qatar/master: (27 commits)
libxvid: Give more suitable names to libxvid-related files.
libxvid: Separate libxvid encoder from libxvid rate control code.
jpeglsdec: Remove write-only variable in ff_jpegls_decode_lse().
fate: cosmetics: lowercase some comments
fate: Give more consistent names to some RealVideo/RealAudio tests.
lavfi: add avfilter_get_audio_buffer_ref_from_arrays().
lavfi: add extended_data to AVFilterBuffer.
lavc: check that extended_data is properly set in avcodec_encode_audio2().
lavc: pad last audio frame with silence when needed.
samplefmt: add a function for filling a buffer with silence.
samplefmt: add a function for copying audio samples.
lavr: do not try to copy to uninitialized output audio data.
lavr: make avresample_read() with NULL output discard samples.
fate: split idroq audio and video into separate tests
fate: improve dependencies
fate: add convenient shorthands for ea-vp6, libavcodec, libavutil tests
fate: split some combined tests into separate audio and video tests
fate: fix dependencies for probe tests
mips: intreadwrite: fix inline asm for gcc 4.8
mips: intreadwrite: remove unnecessary inline asm
...
Conflicts:
cmdutils.h
configure
doc/APIchanges
doc/filters.texi
ffmpeg.c
ffplay.c
libavcodec/internal.h
libavcodec/jpeglsdec.c
libavcodec/libschroedingerdec.c
libavcodec/libxvid.c
libavcodec/libxvid_rc.c
libavcodec/utils.c
libavcodec/version.h
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/buffersink.h
tests/Makefile
tests/fate/aac.mak
tests/fate/audio.mak
tests/fate/demux.mak
tests/fate/ea.mak
tests/fate/image.mak
tests/fate/libavutil.mak
tests/fate/lossless-audio.mak
tests/fate/lossless-video.mak
tests/fate/microsoft.mak
tests/fate/qt.mak
tests/fate/real.mak
tests/fate/screen.mak
tests/fate/video.mak
tests/fate/voice.mak
tests/fate/vqf.mak
tests/ref/fate/ea-mad
tests/ref/fate/ea-tqi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-10 02:25:41 +02:00
..
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-26 07:48:45 +01:00
2012-05-08 16:53:03 +02:00
2012-01-19 00:45:06 +01:00
2012-01-19 00:45:06 +01:00
2012-01-19 00:45:06 +01:00
2012-01-19 00:45:06 +01:00
2012-01-19 00:45:06 +01:00
2012-05-09 14:13:34 +01:00
2012-05-09 14:13:34 +01:00
2012-03-19 17:15:54 -04:00
2012-05-09 14:13:34 +01:00
2012-01-19 00:45:06 +01:00
2012-03-18 15:25:25 -07:00
2012-01-19 00:45:06 +01:00
2012-05-09 14:13:34 +01:00
2012-05-09 14:13:34 +01:00
2012-02-03 09:29:02 +01:00
2012-05-09 14:13:34 +01:00
2011-12-14 20:09:46 +01:00
2012-02-03 09:29:02 +01:00
2012-03-20 14:12:54 -04:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-04-04 21:15:07 +02:00
2011-06-30 09:47:32 +01:00
2012-02-26 07:48:45 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-04-04 11:16:23 -07:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-03-01 03:17:11 +01:00
2012-03-12 17:01:58 +02:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2011-07-03 17:17:54 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-03 09:29:02 +01:00
2012-02-26 07:48:45 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-04-20 10:23:57 -04:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-08 21:51:24 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-05-09 14:13:34 +01:00
2012-01-19 00:45:06 +01:00
2011-12-30 21:14:07 +01:00
2012-02-03 09:29:02 +01:00
2012-03-05 13:08:18 -05:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-03-02 11:11:38 +01:00
2012-05-10 02:25:41 +02:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-05-09 14:13:34 +01:00
2012-05-09 14:13:34 +01:00
2012-05-10 02:25:41 +02:00
2012-03-02 11:11:38 +01:00
2012-03-02 11:11:38 +01:00
2012-04-01 11:01:08 +02:00
2011-08-26 20:54:36 +02:00
2012-02-08 21:51:24 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-04-20 10:23:57 -04:00
2012-03-02 18:58:19 +02:00
2012-04-20 10:23:57 -04:00
2012-04-20 10:23:57 -04:00
2012-04-20 10:23:57 -04:00
2012-04-20 10:23:57 -04:00
2011-09-30 00:13:26 +02:00
2011-09-30 00:13:26 +02:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-01-07 11:04:46 -08:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-02-07 20:11:11 +01:00
2012-02-03 09:29:02 +01:00
2011-05-17 00:58:33 +02:00
2012-02-03 09:29:02 +01:00
2011-07-04 16:26:26 +01:00
2012-02-03 09:29:02 +01:00
2012-02-26 07:48:45 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-04 02:34:14 +01:00
2012-03-27 17:54:04 -07:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-01-19 00:45:06 +01:00
2012-01-19 00:45:06 +01:00
2012-03-23 14:03:03 -07:00
2011-11-04 19:40:32 +01:00
2011-11-04 19:40:32 +01:00
2011-11-04 19:40:32 +01:00
2012-03-20 14:12:53 -04:00
2011-07-03 18:19:18 +01:00
2012-05-09 14:13:34 +01:00
2012-02-08 21:51:24 +01:00
2012-02-26 07:48:45 +01:00
2012-02-04 02:34:14 +01:00
2012-02-26 07:48:45 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-03-01 03:17:11 +01:00
2012-05-09 02:53:42 +02:00
2012-03-20 14:12:54 -04:00
2012-01-19 00:45:06 +01:00
2012-01-19 00:45:06 +01:00
2012-01-19 00:45:06 +01:00
2012-01-19 00:45:06 +01:00
2012-02-04 02:34:14 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-29 09:28:34 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-03-03 17:03:26 -05:00
2012-02-03 09:29:02 +01:00
2011-09-23 20:54:28 -04:00
2011-09-23 20:54:28 -04:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-03 09:29:02 +01:00
2012-05-09 18:12:27 +02:00
2012-04-01 15:56:08 -04:00
2012-02-24 00:36:51 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-05-09 14:13:34 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-05-10 02:25:41 +02:00
2012-02-08 21:51:24 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-26 07:48:45 +01:00
2012-03-20 14:12:54 -04:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-13 22:29:22 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-05-09 14:13:34 +01:00
2012-03-03 17:03:27 -05:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-03-21 01:33:53 +01:00
2012-03-21 01:33:53 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-08 21:51:24 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2011-12-15 13:31:40 +01:00
2012-02-03 09:29:02 +01:00
2012-03-05 18:47:05 +01:00
2012-03-05 18:47:05 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-26 19:32:33 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-08 21:51:24 +01:00
2012-02-26 07:48:45 +01:00
2012-02-04 02:34:14 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-08 21:51:24 +01:00
2012-03-29 06:03:55 +02:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-03-18 23:39:42 +01:00
2012-03-03 17:03:26 -05:00
2012-02-27 09:40:36 -08:00
2012-02-27 09:40:36 -08:00
2012-02-27 09:40:36 -08:00
2012-02-27 09:40:36 -08:00
2012-02-27 09:40:36 -08:00
2012-02-27 09:40:36 -08:00
2012-02-27 09:40:36 -08:00
2012-02-27 09:40:36 -08:00
2012-02-27 09:40:36 -08:00
2012-02-27 09:40:36 -08:00
2012-02-27 09:40:36 -08:00
2012-02-27 09:40:36 -08:00
2012-02-27 09:40:36 -08:00
2012-02-27 09:40:36 -08:00
2012-02-27 09:40:36 -08:00
2012-02-27 09:40:36 -08:00
2012-02-27 09:40:36 -08:00
2012-02-27 09:40:36 -08:00
2012-02-27 09:40:36 -08:00
2012-02-27 09:40:36 -08:00
2012-02-27 09:40:36 -08:00
2012-02-27 09:40:36 -08:00
2012-02-27 09:40:36 -08:00
2012-02-27 09:40:36 -08:00
2012-02-27 09:40:36 -08:00
2012-02-27 09:40:36 -08:00
2012-02-03 09:29:02 +01:00
2012-02-26 07:48:45 +01:00
2012-03-05 13:08:18 -05:00
2012-04-08 20:01:07 +02:00
2012-02-03 09:29:02 +01:00
2012-03-04 04:27:01 +01:00
2012-02-03 09:29:02 +01:00
2012-01-08 18:33:59 -08:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-03-22 19:52:56 +01:00
2012-02-03 09:29:02 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00
2012-02-03 09:29:02 +01:00