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-05-05 22:04:21 +01:00
2012-06-08 13:14:38 -04:00
2012-06-08 13:14:38 -04:00
2012-07-01 11:25:06 +01:00
2012-04-22 22:26:42 +02:00
2012-06-08 23:59:09 +02:00
2012-04-22 22:26:42 +02:00
2012-06-08 23:59:09 +02:00
2012-03-13 01:56:33 +01:00
2012-06-08 23:59:09 +02:00
2012-06-08 23:59:09 +02:00
2012-04-22 22:26:55 +02:00
2012-04-22 22:26:55 +02:00
2012-04-22 22:26:55 +02:00
2012-07-18 22:34:48 +02:00
2012-06-08 23:59:09 +02:00
2012-06-19 20:53:27 +02:00
2012-06-08 23:59:09 +02:00
2012-07-19 18:44:46 +02:00
2012-07-01 22:43:09 +02:00
2012-04-22 22:26:42 +02:00
2012-07-01 22:43:09 +02:00
2012-04-22 22:26:42 +02:00
2012-06-08 23:59:09 +02:00
2012-06-08 23:59:09 +02:00
2012-08-01 10:32:24 +01:00
2012-08-07 13:31:40 +02:00
2012-08-01 23:33:06 +02:00
2012-06-08 23:59:09 +02:00
2012-08-07 22:45:46 +02:00
2012-06-08 23:59:09 +02:00
2012-06-08 23:59:09 +02:00
2012-06-08 13:14:38 -04:00
2012-07-18 10:32:19 +01:00
2012-06-08 13:14:38 -04:00
2012-06-08 23:59:09 +02:00
2012-06-08 13:14:38 -04:00
2012-04-22 12:30:45 +01:00
2012-04-22 22:26:42 +02:00
2012-03-13 01:56:33 +01:00
2012-08-01 23:33:06 +02:00
2012-02-16 01:34:37 +01:00
2012-06-08 23:59:09 +02:00
2012-06-08 23:59:09 +02:00
2012-02-20 14:58:25 -08:00
2012-06-08 13:14:38 -04:00
2012-04-10 10:06:48 -07:00
2012-06-08 13:14:38 -04:00
2012-04-22 12:30:45 +01:00
2012-07-01 11:25:06 +01:00
2012-08-01 23:33:06 +02:00
2012-08-01 23:33:06 +02:00
2012-08-01 23:33:06 +02:00
2012-08-01 23:33:06 +02:00
2012-06-08 23:59:09 +02:00
2012-07-18 22:34:48 +02:00
2012-07-18 22:34:48 +02:00
2012-07-01 22:43:09 +02:00
2012-02-10 01:20:07 +01:00
2012-08-04 00:59:14 +01:00
2012-04-26 22:24:58 +02:00
2012-04-25 21:41:39 +01:00
2012-04-25 21:41:39 +01:00
2012-06-08 23:59:09 +02:00
2012-04-25 21:41:39 +01:00
2012-08-04 23:51:43 +02:00
2012-08-07 22:45:46 +02:00
2012-06-08 23:59:09 +02:00