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