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