Michael Niedermayer
7a72695c05
Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'
* commit '36ef5369ee9b336febc2c270f8718cec4476cb85':
Replace all CODEC_ID_* with AV_CODEC_ID_*
lavc: add AV prefix to codec ids.
Conflicts:
doc/APIchanges
doc/examples/decoding_encoding.c
doc/examples/muxing.c
ffmpeg.c
ffprobe.c
ffserver.c
libavcodec/8svx.c
libavcodec/avcodec.h
libavcodec/dnxhd_parser.c
libavcodec/dvdsubdec.c
libavcodec/error_resilience.c
libavcodec/h263dec.c
libavcodec/libvorbisenc.c
libavcodec/mjpeg_parser.c
libavcodec/mjpegenc.c
libavcodec/mpeg12.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/pcm.c
libavcodec/r210dec.c
libavcodec/utils.c
libavcodec/v210dec.c
libavcodec/version.h
libavdevice/alsa-audio-dec.c
libavdevice/bktr.c
libavdevice/v4l2.c
libavformat/asfdec.c
libavformat/asfenc.c
libavformat/avformat.h
libavformat/avidec.c
libavformat/caf.c
libavformat/electronicarts.c
libavformat/flacdec.c
libavformat/flvdec.c
libavformat/flvenc.c
libavformat/framecrcenc.c
libavformat/img2.c
libavformat/img2dec.c
libavformat/img2enc.c
libavformat/ipmovie.c
libavformat/isom.c
libavformat/matroska.c
libavformat/matroskadec.c
libavformat/matroskaenc.c
libavformat/mov.c
libavformat/movenc.c
libavformat/mp3dec.c
libavformat/mpeg.c
libavformat/mpegts.c
libavformat/mxf.c
libavformat/mxfdec.c
libavformat/mxfenc.c
libavformat/nsvdec.c
libavformat/nut.c
libavformat/oggenc.c
libavformat/pmpdec.c
libavformat/rawdec.c
libavformat/rawenc.c
libavformat/riff.c
libavformat/sdp.c
libavformat/utils.c
libavformat/vocenc.c
libavformat/wtv.c
libavformat/xmv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-07 22:45:46 +02:00
..
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 16:00:24 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-07-29 01:28:12 +00:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-07-31 22:41:00 +02:00
2012-07-29 02:31:27 +00:00
2011-12-31 22:33:58 +01:00
2011-11-05 16:51:25 +01:00
2012-03-29 04:11:10 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-04-01 21:21:13 +02:00
2012-03-25 01:56:53 +01:00
2012-03-25 01:56:53 +01:00
2012-08-07 22:45:46 +02:00
2011-11-28 01:07:11 +01:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2011-12-19 11:57:34 +01:00
2012-06-22 22:34:02 +02:00
2012-07-28 01:16:09 +02:00
2012-07-27 12:46:51 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-03-03 04:30:49 +01:00
2012-08-07 16:00:24 +02:00
2012-08-07 22:45:46 +02:00
2012-02-06 02:04:09 +01:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2011-12-02 00:51:11 +01:00
2012-08-07 22:45:46 +02:00
2011-11-13 13:14:39 +01:00
2012-02-16 01:34:37 +01:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-02-16 01:34:37 +01:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-07-30 23:28:31 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-07-30 23:28:31 +02:00
2012-07-05 10:55:49 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2011-12-11 01:05:33 +01:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-06-28 23:57:31 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-02-03 09:29:02 +01:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-01-06 02:45:12 +01:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-07-30 23:28:31 +02:00
2012-07-06 17:08:22 +02:00
2012-06-28 00:18:24 +02:00
2012-07-06 17:08:22 +02:00
2012-07-26 21:37:15 +02:00
2012-03-14 02:10:11 +01:00
2012-08-07 22:45:46 +02:00
2012-01-29 00:34:59 +01:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-06-21 22:37:43 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-07-05 13:02:49 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-06-04 00:33:42 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-07-29 01:28:12 +00:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02: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-03-26 20:03:57 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2011-12-12 01:25:37 +01:00
2012-01-06 02:45:12 +01:00
2012-06-20 20:47:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 16:00:24 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-04 12:01:24 -07:00
2012-05-26 22:37:37 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-02-29 00:30:35 +01:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-07-10 13:51:04 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-06-27 01:58:09 +02:00
2012-07-16 20:45:41 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-07-20 11:16:52 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-03-23 04:29:33 +01:00
2012-08-07 16:00:24 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-04-16 18:36:39 +02:00
2012-07-26 03:30:35 +02:00
2012-08-07 16:00:24 +02:00
2012-07-29 23:04:49 +02:00
2012-07-30 03:48:46 +02:00
2012-07-18 22:34:48 +02:00
2012-06-30 22:44:18 +02:00
2012-08-07 22:45:46 +02:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-02-01 02:36:09 +01:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2011-11-03 02:16:26 +01:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-07-23 21:25:09 +02:00
2012-07-24 21:15:57 +02:00
2012-07-23 21:25:09 +02:00
2012-07-24 21:15:57 +02:00
2012-07-23 21:25:09 +02:00
2012-07-18 01:27:19 +02:00
2012-08-02 23:34:01 +02:00
2012-08-02 23:34:01 +02:00
2012-07-31 22:41:00 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-06-19 20:53:27 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 16:00:24 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-01-29 00:34:59 +01:00
2012-05-26 22:37:37 +02:00
2012-05-26 22:37:37 +02:00
2012-03-01 16:08:32 +02:00
2012-06-17 00:38:39 +02:00
2012-06-18 20:07:00 +02:00
2012-01-29 00:34:59 +01:00
2012-08-07 22:45:46 +02:00
2012-07-22 05:05:02 +02:00
2012-06-20 20:47:46 +02:00
2012-08-07 22:45:46 +02:00
2012-07-11 23:57:11 +02:00
2012-07-11 23:57:11 +02:00
2012-07-30 23:28:31 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-07-30 23:28:31 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-07-25 20:31:16 +03:00
2012-08-07 22:45:46 +02:00
2012-05-04 14:40:22 +02:00
2012-03-06 06:03:32 +01:00
2012-03-06 06:03:32 +01:00
2012-08-07 22:45:46 +02:00
2012-07-31 22:41:00 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-06-29 01:58:34 +00:00
2012-06-29 01:58:34 +00:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-06-29 20:20:02 +02:00
2012-06-29 20:20:02 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-07-25 22:00:06 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-07-29 02:16:26 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-06 10:06:26 +02:00
2012-06-01 14:47:30 +02:00
2012-07-26 21:37:15 +02:00
2012-07-26 21:37:15 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-05 15:45:48 +02:00
2012-08-07 22:45:46 +02:00
2012-02-16 01:34:37 +01:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2011-12-13 00:39:48 +01:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00
2012-08-07 22:45:46 +02:00