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>

1 files changed, 52 insertions, 52 deletions

diff --git a/libavformat/img2.c b/libavformat/img2.c
index 1fb9c3bcb8..ed4b39afe0 100644
--- a/libavformat/img2.c
+++ b/libavformat/img2.c
@@ -24,64 +24,64 @@
 #include "internal.h"
 
 typedef struct {
-    enum CodecID id;
+    enum AVCodecID id;
     const char *str;
 } IdStrMap;
 
 static const IdStrMap img_tags[] = {
-    { CODEC_ID_MJPEG     , "jpeg"},
-    { CODEC_ID_MJPEG     , "jpg"},
-    { CODEC_ID_MJPEG     , "jps"},
-    { CODEC_ID_LJPEG     , "ljpg"},
-    { CODEC_ID_JPEGLS    , "jls"},
-    { CODEC_ID_PNG       , "png"},
-    { CODEC_ID_PNG       , "pns"},
-    { CODEC_ID_PNG       , "mng"},
-    { CODEC_ID_PPM       , "ppm"},
-    { CODEC_ID_PPM       , "pnm"},
-    { CODEC_ID_PGM       , "pgm"},
-    { CODEC_ID_PGMYUV    , "pgmyuv"},
-    { CODEC_ID_PBM       , "pbm"},
-    { CODEC_ID_PAM       , "pam"},
-    { CODEC_ID_MPEG1VIDEO, "mpg1-img"},
-    { CODEC_ID_MPEG2VIDEO, "mpg2-img"},
-    { CODEC_ID_MPEG4     , "mpg4-img"},
-    { CODEC_ID_FFV1      , "ffv1-img"},
-    { CODEC_ID_RAWVIDEO  , "y"},
-    { CODEC_ID_RAWVIDEO  , "raw"},
-    { CODEC_ID_BMP       , "bmp"},
-    { CODEC_ID_GIF       , "gif"},
-    { CODEC_ID_TARGA     , "tga"},
-    { CODEC_ID_TIFF      , "tiff"},
-    { CODEC_ID_TIFF      , "tif"},
-    { CODEC_ID_SGI       , "sgi"},
-    { CODEC_ID_PTX       , "ptx"},
-    { CODEC_ID_PCX       , "pcx"},
-    { CODEC_ID_SUNRAST   , "sun"},
-    { CODEC_ID_SUNRAST   , "ras"},
-    { CODEC_ID_SUNRAST   , "rs"},
-    { CODEC_ID_SUNRAST   , "im1"},
-    { CODEC_ID_SUNRAST   , "im8"},
-    { CODEC_ID_SUNRAST   , "im24"},
-    { CODEC_ID_SUNRAST   , "im32"},
-    { CODEC_ID_SUNRAST   , "sunras"},
-    { CODEC_ID_JPEG2000  , "j2c"},
-    { CODEC_ID_JPEG2000  , "j2k"},
-    { CODEC_ID_JPEG2000  , "jp2"},
-    { CODEC_ID_JPEG2000  , "jpc"},
-    { CODEC_ID_DPX       , "dpx"},
-    { CODEC_ID_EXR       , "exr"},
-    { CODEC_ID_PICTOR    , "pic"},
-    { CODEC_ID_V210X     , "yuv10"},
-    { CODEC_ID_XBM       , "xbm"},
-    { CODEC_ID_XWD       , "xwd"},
-    { CODEC_ID_NONE      , NULL}
+    { AV_CODEC_ID_MJPEG     , "jpeg"},
+    { AV_CODEC_ID_MJPEG     , "jpg"},
+    { AV_CODEC_ID_MJPEG     , "jps"},
+    { AV_CODEC_ID_LJPEG     , "ljpg"},
+    { AV_CODEC_ID_JPEGLS    , "jls"},
+    { AV_CODEC_ID_PNG       , "png"},
+    { AV_CODEC_ID_PNG       , "pns"},
+    { AV_CODEC_ID_PNG       , "mng"},
+    { AV_CODEC_ID_PPM       , "ppm"},
+    { AV_CODEC_ID_PPM       , "pnm"},
+    { AV_CODEC_ID_PGM       , "pgm"},
+    { AV_CODEC_ID_PGMYUV    , "pgmyuv"},
+    { AV_CODEC_ID_PBM       , "pbm"},
+    { AV_CODEC_ID_PAM       , "pam"},
+    { AV_CODEC_ID_MPEG1VIDEO, "mpg1-img"},
+    { AV_CODEC_ID_MPEG2VIDEO, "mpg2-img"},
+    { AV_CODEC_ID_MPEG4     , "mpg4-img"},
+    { AV_CODEC_ID_FFV1      , "ffv1-img"},
+    { AV_CODEC_ID_RAWVIDEO  , "y"},
+    { AV_CODEC_ID_RAWVIDEO  , "raw"},
+    { AV_CODEC_ID_BMP       , "bmp"},
+    { AV_CODEC_ID_GIF       , "gif"},
+    { AV_CODEC_ID_TARGA     , "tga"},
+    { AV_CODEC_ID_TIFF      , "tiff"},
+    { AV_CODEC_ID_TIFF      , "tif"},
+    { AV_CODEC_ID_SGI       , "sgi"},
+    { AV_CODEC_ID_PTX       , "ptx"},
+    { AV_CODEC_ID_PCX       , "pcx"},
+    { AV_CODEC_ID_SUNRAST   , "sun"},
+    { AV_CODEC_ID_SUNRAST   , "ras"},
+    { AV_CODEC_ID_SUNRAST   , "rs"},
+    { AV_CODEC_ID_SUNRAST   , "im1"},
+    { AV_CODEC_ID_SUNRAST   , "im8"},
+    { AV_CODEC_ID_SUNRAST   , "im24"},
+    { AV_CODEC_ID_SUNRAST   , "im32"},
+    { AV_CODEC_ID_SUNRAST   , "sunras"},
+    { AV_CODEC_ID_JPEG2000  , "j2c"},
+    { AV_CODEC_ID_JPEG2000  , "j2k"},
+    { AV_CODEC_ID_JPEG2000  , "jp2"},
+    { AV_CODEC_ID_JPEG2000  , "jpc"},
+    { AV_CODEC_ID_DPX       , "dpx"},
+    { AV_CODEC_ID_EXR       , "exr"},
+    { AV_CODEC_ID_PICTOR    , "pic"},
+    { AV_CODEC_ID_V210X     , "yuv10"},
+    { AV_CODEC_ID_XBM       , "xbm"},
+    { AV_CODEC_ID_XWD       , "xwd"},
+    { AV_CODEC_ID_NONE      , NULL}
 };
 
-static enum CodecID av_str2id(const IdStrMap *tags, const char *str)
+static enum AVCodecID av_str2id(const IdStrMap *tags, const char *str)
 {
     str= strrchr(str, '.');
-    if(!str) return CODEC_ID_NONE;
+    if(!str) return AV_CODEC_ID_NONE;
     str++;
 
     while (tags->id) {
@@ -90,10 +90,10 @@ static enum CodecID av_str2id(const IdStrMap *tags, const char *str)
 
         tags++;
     }
-    return CODEC_ID_NONE;
+    return AV_CODEC_ID_NONE;
 }
 
-enum CodecID ff_guess_image2_codec(const char *filename)
+enum AVCodecID ff_guess_image2_codec(const char *filename)
 {
     return av_str2id(img_tags, filename);
 }