Michael Niedermayer
a369a6b858
Merge remote-tracking branch 'qatar/master'
...
* qatar/master: (29 commits)
fate: add golomb-test
golomb-test: K&R formatting cosmetics
h264: Split h264-test off into a separate file - golomb-test.c.
h264-test: cleanup: drop timer invocations, commented out code and other cruft
h264-test: Remove unused DSP and AVCodec contexts and related init calls.
adpcm: Add missing stdint.h #include to fix standalone header compilation.
lavf: add functions for accessing the fourcc<->CodecID mapping tables.
lavc: set AVCodecContext.codec in avcodec_get_context_defaults3().
lavc: make avcodec_close() work properly on unopened codecs.
lavc: add avcodec_is_open().
lavf: rename AVInputFormat.value to raw_codec_id.
lavf: remove the pointless value field from flv and iv8
lavc/lavf: remove unnecessary symbols from the symbol version script.
lavc: reorder AVCodec fields.
lavf: reorder AVInput/OutputFormat fields.
mp3dec: Fix a heap-buffer-overflow
adpcmenc: remove some unneeded casts
adpcmenc: use int16_t and uint8_t instead of short and unsigned char.
adpcmenc: fix adpcm_ms extradata allocation
adpcmenc: return proper AVERROR codes instead of -1
...
Conflicts:
doc/APIchanges
libavcodec/Makefile
libavcodec/adpcmenc.c
libavcodec/avcodec.h
libavcodec/h264.c
libavcodec/libavcodec.v
libavcodec/mpc7.c
libavcodec/mpegaudiodec.c
libavcodec/options.c
libavformat/Makefile
libavformat/avformat.h
libavformat/flvdec.c
libavformat/libavformat.v
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-01 02:36:09 +01:00
..
2011-11-09 01:58:22 +01:00
2011-11-09 01:58:22 +01:00
2011-04-12 19:06:26 -04:00
2011-12-13 15:46:23 +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-01-19 00:45:06 +01:00
2012-01-19 00:45:06 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00: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-01-19 00:45:06 +01:00
2011-12-14 20:09:46 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-08-21 20:57:24 +00:00
2011-11-09 01:58:22 +01:00
2012-01-19 00:45:06 +01:00
2010-03-15 19:23:24 +00:00
2011-06-30 09:47:32 +01:00
2012-01-29 14:17:11 +01:00
2011-04-12 19:06:26 -04:00
2010-03-15 19:23:24 +00:00
2012-01-19 00:45:06 +01:00
2012-01-07 11:10:58 -08:00
2010-03-15 19:23:24 +00:00
2011-11-23 21:58:10 +01:00
2011-12-28 22:05:24 +01:00
2011-04-12 19:06:26 -04:00
2011-07-03 17:17:54 +01:00
2011-11-12 20:47:33 +01:00
2010-03-15 19:23:24 +00:00
2012-01-29 14:17:11 +01:00
2012-01-08 14:20:04 -08:00
2010-03-15 19:23:24 +00:00
2012-01-20 02:14:54 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2012-01-29 14:17:11 +01:00
2012-01-02 03:10:30 +01:00
2012-01-02 03:10:30 +01:00
2012-01-02 03:10:30 +01:00
2012-01-28 21:59:01 +01:00
2012-01-02 03:10:30 +01:00
2012-01-02 03:10:30 +01:00
2012-01-02 03:10:30 +01:00
2012-01-02 03:10:30 +01:00
2012-01-02 03:10:30 +01:00
2012-01-02 03:10:30 +01:00
2012-01-02 03:10:30 +01:00
2012-01-19 00:45:06 +01:00
2012-01-19 00:45:06 +01:00
2011-12-30 21:14:07 +01:00
2010-03-15 19:23:24 +00:00
2012-01-19 00:45:06 +01:00
2010-08-31 11:11:25 +00:00
2012-01-03 23:16:29 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2012-01-17 12:03:30 +01:00
2011-08-26 20:54:36 +02:00
2012-01-29 14:17:11 +01:00
2011-11-13 14:50:01 +01:00
2010-03-15 19:23:24 +00:00
2011-11-13 14:50:01 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2012-01-29 14:17:12 +01:00
2012-01-29 14:17:12 +01:00
2010-03-15 19:23:24 +00:00
2011-11-09 00:06:08 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-09-11 10:23:02 +00:00
2011-10-18 10:45:22 +03:00
2011-09-30 00:13:26 +02:00
2011-09-30 00:13:26 +02:00
2012-01-31 19:56:13 +01:00
2010-10-02 09:56:21 +00:00
2012-01-19 00:45:06 +01:00
2012-01-07 11:04:46 -08:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-11-29 10:35:57 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-08-23 14:29:36 +02:00
2011-08-23 14:29:36 +02:00
2011-08-23 14:29:36 +02:00
2011-08-23 14:29:36 +02:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-05-11 16:47:47 +02:00
2011-05-11 16:47:47 +02:00
2011-05-11 16:47:47 +02:00
2011-05-23 08:44:31 -04:00
2011-05-11 16:47:47 +02:00
2011-05-11 16:47:47 +02:00
2011-05-11 16:47:47 +02:00
2011-08-23 14:29:36 +02:00
2011-08-23 14:29:36 +02:00
2011-08-23 14:29:36 +02:00
2011-08-23 14:29:36 +02:00
2011-08-23 14:29:36 +02:00
2011-08-23 14:29:36 +02:00
2011-08-23 14:29:36 +02:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-01-24 22:26:13 +00:00
2010-11-04 21:48:54 +00:00
2012-01-29 14:17:11 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-05-17 00:58:33 +02:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-07-04 16:26:26 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2012-01-07 11:09:04 -08:00
2010-03-15 19:23:24 +00:00
2011-12-27 18:26:31 +01:00
2011-11-09 01:58:22 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-08-17 20:00:06 +02:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2012-01-19 00:45:06 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2012-01-19 00:45:06 +01:00
2010-03-15 19:23:24 +00:00
2012-01-19 00:45:06 +01: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
2010-03-15 19:23:24 +00:00
2011-07-03 18:19:18 +01:00
2012-01-29 14:17:11 +01:00
2010-08-31 11:13:14 +00:00
2011-11-09 01:58:22 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2012-01-29 14:17:11 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-07-17 10:50:25 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-11-09 01:58:22 +01:00
2010-03-15 19:23:24 +00:00
2011-11-09 01:58:22 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-04-19 11:51:40 +00:00
2012-01-29 14:17:11 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00: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
2011-11-13 14:52:21 +01:00
2011-10-14 19:48:41 +02:00
2011-10-14 19:48:41 +02:00
2011-10-14 19:48:41 +02:00
2011-10-14 21:34:20 +02:00
2011-10-15 14:59:44 +01:00
2011-04-12 19:06:26 -04:00
2011-03-26 16:39:22 -04:00
2011-11-09 01:58:22 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-09-23 20:54:28 -04:00
2011-09-23 20:54:28 -04:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-12-07 21:11:51 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-11-09 01:58:22 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2012-01-29 14:17:11 +01:00
2011-12-15 14:34:09 +01:00
2010-03-15 19:23:24 +00:00
2011-08-17 20:00:06 +02:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-11-09 01:58:22 +01:00
2011-08-17 15:00:42 +02:00
2010-08-31 20:07:38 +00:00
2012-01-29 14:17:11 +01:00
2011-04-12 19:06:26 -04:00
2011-09-14 11:13:54 +03:00
2011-01-14 22:32:26 +00:00
2012-01-08 18:31:50 -08:00
2010-03-15 19:23:24 +00:00
2010-12-28 23:52:53 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2012-01-13 15:45:30 -05:00
2012-01-15 01:16:54 +01:00
2012-01-13 15:45:30 -05:00
2012-01-13 15:45:30 -05:00
2012-01-13 15:45:30 -05:00
2012-01-13 15:45:30 -05:00
2012-01-15 01:16:54 +01:00
2012-01-13 15:45:30 -05:00
2012-01-13 15:45:30 -05:00
2012-01-13 15:45:30 -05:00
2012-01-13 15:45:30 -05:00
2012-01-29 14:17:11 +01:00
2012-01-19 00:45:06 +01:00
2012-01-19 00:45:06 +01:00
2010-03-15 19:23:24 +00:00
2011-11-09 01:58:22 +01:00
2011-10-16 04:02:09 +02:00
2012-01-19 00:45:06 +01:00
2011-11-09 01:58:22 +01:00
2012-01-29 14:17:11 +01:00
2010-08-24 20:48:58 +00:00
2010-08-24 20:48:58 +00:00
2010-03-15 19:23:24 +00:00
2011-12-10 15:29:53 +01:00
2011-12-10 15:29:53 +01:00
2011-12-10 15:29:53 +01:00
2011-12-10 15:29:53 +01:00
2011-12-10 15:29:53 +01:00
2011-12-10 15:29:53 +01:00
2011-12-10 15:29:53 +01:00
2011-12-10 15:29:53 +01:00
2011-09-07 12:16:15 +02:00
2011-12-15 13:31:40 +01:00
2011-12-15 13:31:40 +01:00
2011-12-03 01:50:07 +01:00
2012-01-29 14:17:11 +01:00
2012-01-29 14:17:11 +01:00
2012-01-29 14:17:11 +01:00
2012-01-29 14:17:11 +01:00
2012-01-29 14:17:11 +01:00
2010-03-15 19:23:24 +00:00
2012-01-19 00:45:06 +01:00
2011-11-09 01:58:22 +01:00
2012-01-29 14:17:11 +01:00
2012-01-05 11:14:23 -08:00
2011-09-11 17:44:20 +02:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2012-01-29 14:17:11 +01:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-07-12 20:24:23 +00:00
2010-07-12 20:24:23 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-07-12 20:24:23 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2012-01-19 00:45:06 +01:00
2011-12-15 21:28:54 +01:00
2010-04-13 14:29:13 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2012-01-29 14:17:11 +01:00
2011-04-12 19:06:26 -04:00
2012-01-08 17:26:24 +01:00
2010-03-15 19:23:24 +00:00
2010-08-28 14:51:51 +00:00
2012-01-08 14:53:35 -08:00
2012-01-07 11:21:27 -08:00
2012-01-08 18:33:59 -08:00
2012-01-07 11:06:53 -08:00
2011-11-12 20:49:53 +01:00
2010-03-15 19:23:24 +00:00
2011-09-11 17:44:20 +02:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00