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
2012-01-28 07:53:34 +01:00
2011-11-29 00:20:29 +01:00
2012-02-01 02:36:09 +01:00
2012-02-01 02:36:09 +01:00
2012-01-28 07:53:34 +01:00
2011-12-03 03:00:30 +01:00
2012-01-31 07:50:31 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 07:53:34 +01:00
2011-12-12 01:25:37 +01:00
2012-01-26 02:23:56 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2011-12-30 03:46:24 +01:00
2011-12-31 22:33:58 +01:00
2012-01-28 07:53:34 +01:00
2011-12-01 02:54:24 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-02-01 02:36:09 +01:00
2011-11-28 01:07:11 +01:00
2012-01-31 00:20:52 +01:00
2011-12-13 20:01:49 +01:00
2011-12-19 11:57:34 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-29 18:11:39 +01:00
2012-01-28 07:53:34 +01:00
2012-01-27 10:51:57 +01:00
2012-01-28 07:53:34 +01:00
2011-12-31 02:27:10 +01:00
2012-01-28 07:53:34 +01:00
2012-01-23 17:18:13 +01:00
2012-01-28 07:53:34 +01:00
2011-12-02 00:51:11 +01:00
2011-12-30 20:00:53 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-02-01 02:36:09 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 22:01:05 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-02-01 02:36:09 +01:00
2011-12-11 01:05:33 +01:00
2012-01-28 07:53:34 +01:00
2011-12-22 01:51:53 +01:00
2012-02-01 02:36:09 +01:00
2011-12-16 01:23:15 +01:00
2012-01-28 22:01:09 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-06 02:45:12 +01:00
2012-01-31 07:50:31 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-06 02:45:12 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 07:53:34 +01:00
2012-01-29 00:34:59 +01:00
2011-12-31 17:15:31 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-30 11:28:08 +01:00
2012-02-01 02:36:09 +01:00
2011-12-22 01:51:53 +01:00
2012-01-28 07:53:34 +01:00
2012-01-30 11:30:52 +01:00
2012-01-26 02:23:56 +01:00
2012-01-29 00:34:59 +01:00
2012-02-01 02:36:09 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2011-12-03 03:00:30 +01:00
2012-01-31 07:26:31 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-06 02:45:12 +01:00
2012-01-28 07:53:34 +01:00
2012-02-01 02:36:09 +01:00
2012-01-29 00:34:59 +01:00
2012-02-01 02:36:09 +01:00
2012-01-28 07:53:34 +01:00
2011-12-12 01:25:37 +01:00
2011-12-30 20:00:53 +01:00
2011-12-02 00:51:11 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2011-12-12 01:25:37 +01:00
2012-01-06 02:45:12 +01:00
2012-01-06 02:45:12 +01:00
2012-01-05 10:34:06 -08:00
2012-01-05 10:34:06 -08:00
2012-02-01 02:36:09 +01:00
2012-01-31 02:46:26 +01:00
2012-01-31 02:46:26 +01:00
2012-01-29 00:34:59 +01:00
2012-01-30 23:29:34 +01:00
2012-01-02 15:34:03 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-31 02:46:26 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2011-12-21 16:28:45 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-29 00:34:59 +01:00
2012-01-31 02:46:26 +01:00
2011-12-03 03:00:30 +01:00
2011-12-21 03:40:53 +01:00
2012-01-28 07:53:34 +01:00
2011-12-01 02:54:24 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-11-30 20:34:45 +01:00
2011-12-01 02:54:24 +01:00
2011-11-30 20:34:45 +01:00
2011-11-30 20:34:45 +01:00
2011-11-30 20:34:45 +01:00
2011-12-19 02:34:18 +01:00
2011-12-20 22:38:53 +01:00
2012-01-29 00:34:59 +01:00
2011-12-18 16:23:16 +01:00
2012-01-28 07:53:34 +01:00
2012-02-01 02:36:09 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-02-01 02:36:09 +01:00
2012-02-01 02:36:09 +01:00
2012-01-05 02:03:12 +01:00
2012-02-01 02:36:09 +01:00
2011-12-13 00:39:48 +01:00
2012-01-22 19:32:44 +01:00
2011-11-28 01:07:11 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 07:53:34 +01:00
2012-01-03 03:06:45 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2011-11-29 00:20:29 +01:00
2011-12-12 01:25:37 +01:00
2012-01-06 02:45:12 +01:00
2011-12-12 01:25:37 +01:00
2012-01-29 00:34:59 +01:00
2011-12-13 00:39:48 +01:00
2011-11-30 17:39:32 +02:00
2011-12-02 00:51:11 +01:00
2012-01-29 00:34:59 +01:00
2011-11-29 00:20:29 +01:00
2011-12-13 00:39:48 +01:00
2011-12-01 02:54:24 +01:00
2012-01-21 23:11:27 +01:00
2011-12-01 02:54:24 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2011-12-12 01:25:37 +01:00
2012-01-29 00:34:59 +01:00
2011-12-02 00:51:11 +01:00
2012-01-06 02:45:12 +01:00
2012-01-31 02:46:26 +01:00
2012-01-23 01:05:20 +01:00
2012-01-28 07:53:34 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 07:53:34 +01:00
2012-01-29 00:34:59 +01:00
2011-12-13 00:39:48 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 07:53:34 +01:00
2012-01-13 15:57:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-17 02:37:30 +01:00
2012-01-16 11:29:55 +01:00
2012-01-27 10:51:57 +01:00
2012-01-16 11:29:55 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2011-12-12 01:25:37 +01:00
2012-01-28 07:53:34 +01:00
2012-01-05 16:27:07 -08:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-06 02:45:12 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-05 23:56:52 +02:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-14 17:14:18 +01:00
2012-01-28 07:53:34 +01:00
2012-02-01 02:36:09 +01:00
2012-01-28 07:53:34 +01:00
2011-12-30 20:00:53 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2011-12-13 00:39:48 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-27 10:51:57 +01:00
2012-01-28 07:53:34 +01:00
2012-01-27 10:51:57 +01:00
2012-01-28 07:53:34 +01:00
2011-12-03 03:24:32 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-31 02:46:26 +01:00
a369a6b858