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, 65 insertions, 65 deletions

diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index ea91ed7494..b386d7421b 100644
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@ -22,78 +22,78 @@
 #include "matroska.h"
 
 const CodecTags ff_mkv_codec_tags[]={
-    {"A_AAC"            , CODEC_ID_AAC},
-    {"A_AC3"            , CODEC_ID_AC3},
-    {"A_ALAC"           , CODEC_ID_ALAC},
-    {"A_DTS"            , CODEC_ID_DTS},
-    {"A_EAC3"           , CODEC_ID_EAC3},
-    {"A_FLAC"           , CODEC_ID_FLAC},
-    {"A_MLP"            , CODEC_ID_MLP},
-    {"A_MPEG/L2"        , CODEC_ID_MP2},
-    {"A_MPEG/L1"        , CODEC_ID_MP2},
-    {"A_MPEG/L3"        , CODEC_ID_MP3},
-    {"A_OPUS",            CODEC_ID_OPUS},
-    {"A_PCM/FLOAT/IEEE" , CODEC_ID_PCM_F32LE},
-    {"A_PCM/FLOAT/IEEE" , CODEC_ID_PCM_F64LE},
-    {"A_PCM/INT/BIG"    , CODEC_ID_PCM_S16BE},
-    {"A_PCM/INT/BIG"    , CODEC_ID_PCM_S24BE},
-    {"A_PCM/INT/BIG"    , CODEC_ID_PCM_S32BE},
-    {"A_PCM/INT/LIT"    , CODEC_ID_PCM_S16LE},
-    {"A_PCM/INT/LIT"    , CODEC_ID_PCM_S24LE},
-    {"A_PCM/INT/LIT"    , CODEC_ID_PCM_S32LE},
-    {"A_PCM/INT/LIT"    , CODEC_ID_PCM_U8},
-    {"A_QUICKTIME/QDM2" , CODEC_ID_QDM2},
-    {"A_REAL/14_4"      , CODEC_ID_RA_144},
-    {"A_REAL/28_8"      , CODEC_ID_RA_288},
-    {"A_REAL/ATRC"      , CODEC_ID_ATRAC3},
-    {"A_REAL/COOK"      , CODEC_ID_COOK},
-    {"A_REAL/SIPR"      , CODEC_ID_SIPR},
-    {"A_TRUEHD"         , CODEC_ID_TRUEHD},
-    {"A_TTA1"           , CODEC_ID_TTA},
-    {"A_VORBIS"         , CODEC_ID_VORBIS},
-    {"A_WAVPACK4"       , CODEC_ID_WAVPACK},
+    {"A_AAC"            , AV_CODEC_ID_AAC},
+    {"A_AC3"            , AV_CODEC_ID_AC3},
+    {"A_ALAC"           , AV_CODEC_ID_ALAC},
+    {"A_DTS"            , AV_CODEC_ID_DTS},
+    {"A_EAC3"           , AV_CODEC_ID_EAC3},
+    {"A_FLAC"           , AV_CODEC_ID_FLAC},
+    {"A_MLP"            , AV_CODEC_ID_MLP},
+    {"A_MPEG/L2"        , AV_CODEC_ID_MP2},
+    {"A_MPEG/L1"        , AV_CODEC_ID_MP2},
+    {"A_MPEG/L3"        , AV_CODEC_ID_MP3},
+    {"A_OPUS",            AV_CODEC_ID_OPUS},
+    {"A_PCM/FLOAT/IEEE" , AV_CODEC_ID_PCM_F32LE},
+    {"A_PCM/FLOAT/IEEE" , AV_CODEC_ID_PCM_F64LE},
+    {"A_PCM/INT/BIG"    , AV_CODEC_ID_PCM_S16BE},
+    {"A_PCM/INT/BIG"    , AV_CODEC_ID_PCM_S24BE},
+    {"A_PCM/INT/BIG"    , AV_CODEC_ID_PCM_S32BE},
+    {"A_PCM/INT/LIT"    , AV_CODEC_ID_PCM_S16LE},
+    {"A_PCM/INT/LIT"    , AV_CODEC_ID_PCM_S24LE},
+    {"A_PCM/INT/LIT"    , AV_CODEC_ID_PCM_S32LE},
+    {"A_PCM/INT/LIT"    , AV_CODEC_ID_PCM_U8},
+    {"A_QUICKTIME/QDM2" , AV_CODEC_ID_QDM2},
+    {"A_REAL/14_4"      , AV_CODEC_ID_RA_144},
+    {"A_REAL/28_8"      , AV_CODEC_ID_RA_288},
+    {"A_REAL/ATRC"      , AV_CODEC_ID_ATRAC3},
+    {"A_REAL/COOK"      , AV_CODEC_ID_COOK},
+    {"A_REAL/SIPR"      , AV_CODEC_ID_SIPR},
+    {"A_TRUEHD"         , AV_CODEC_ID_TRUEHD},
+    {"A_TTA1"           , AV_CODEC_ID_TTA},
+    {"A_VORBIS"         , AV_CODEC_ID_VORBIS},
+    {"A_WAVPACK4"       , AV_CODEC_ID_WAVPACK},
 
-    {"S_TEXT/UTF8"      , CODEC_ID_TEXT},
-    {"S_TEXT/UTF8"      , CODEC_ID_SRT},
-    {"S_TEXT/ASCII"     , CODEC_ID_TEXT},
-    {"S_TEXT/ASS"       , CODEC_ID_SSA},
-    {"S_TEXT/SSA"       , CODEC_ID_SSA},
-    {"S_ASS"            , CODEC_ID_SSA},
-    {"S_SSA"            , CODEC_ID_SSA},
-    {"S_VOBSUB"         , CODEC_ID_DVD_SUBTITLE},
-    {"S_HDMV/PGS"       , CODEC_ID_HDMV_PGS_SUBTITLE},
+    {"S_TEXT/UTF8"      , AV_CODEC_ID_TEXT},
+    {"S_TEXT/UTF8"      , AV_CODEC_ID_SRT},
+    {"S_TEXT/ASCII"     , AV_CODEC_ID_TEXT},
+    {"S_TEXT/ASS"       , AV_CODEC_ID_SSA},
+    {"S_TEXT/SSA"       , AV_CODEC_ID_SSA},
+    {"S_ASS"            , AV_CODEC_ID_SSA},
+    {"S_SSA"            , AV_CODEC_ID_SSA},
+    {"S_VOBSUB"         , AV_CODEC_ID_DVD_SUBTITLE},
+    {"S_HDMV/PGS"       , AV_CODEC_ID_HDMV_PGS_SUBTITLE},
 
-    {"V_DIRAC"          , CODEC_ID_DIRAC},
-    {"V_MJPEG"          , CODEC_ID_MJPEG},
-    {"V_MPEG1"          , CODEC_ID_MPEG1VIDEO},
-    {"V_MPEG2"          , CODEC_ID_MPEG2VIDEO},
-    {"V_MPEG4/ISO/ASP"  , CODEC_ID_MPEG4},
-    {"V_MPEG4/ISO/AP"   , CODEC_ID_MPEG4},
-    {"V_MPEG4/ISO/SP"   , CODEC_ID_MPEG4},
-    {"V_MPEG4/ISO/AVC"  , CODEC_ID_H264},
-    {"V_MPEG4/MS/V3"    , CODEC_ID_MSMPEG4V3},
-    {"V_REAL/RV10"      , CODEC_ID_RV10},
-    {"V_REAL/RV20"      , CODEC_ID_RV20},
-    {"V_REAL/RV30"      , CODEC_ID_RV30},
-    {"V_REAL/RV40"      , CODEC_ID_RV40},
-    {"V_SNOW"           , CODEC_ID_SNOW},
-    {"V_THEORA"         , CODEC_ID_THEORA},
-    {"V_UNCOMPRESSED"   , CODEC_ID_RAWVIDEO},
-    {"V_VP8"            , CODEC_ID_VP8},
+    {"V_DIRAC"          , AV_CODEC_ID_DIRAC},
+    {"V_MJPEG"          , AV_CODEC_ID_MJPEG},
+    {"V_MPEG1"          , AV_CODEC_ID_MPEG1VIDEO},
+    {"V_MPEG2"          , AV_CODEC_ID_MPEG2VIDEO},
+    {"V_MPEG4/ISO/ASP"  , AV_CODEC_ID_MPEG4},
+    {"V_MPEG4/ISO/AP"   , AV_CODEC_ID_MPEG4},
+    {"V_MPEG4/ISO/SP"   , AV_CODEC_ID_MPEG4},
+    {"V_MPEG4/ISO/AVC"  , AV_CODEC_ID_H264},
+    {"V_MPEG4/MS/V3"    , AV_CODEC_ID_MSMPEG4V3},
+    {"V_REAL/RV10"      , AV_CODEC_ID_RV10},
+    {"V_REAL/RV20"      , AV_CODEC_ID_RV20},
+    {"V_REAL/RV30"      , AV_CODEC_ID_RV30},
+    {"V_REAL/RV40"      , AV_CODEC_ID_RV40},
+    {"V_SNOW"           , AV_CODEC_ID_SNOW},
+    {"V_THEORA"         , AV_CODEC_ID_THEORA},
+    {"V_UNCOMPRESSED"   , AV_CODEC_ID_RAWVIDEO},
+    {"V_VP8"            , AV_CODEC_ID_VP8},
 
-    {""                 , CODEC_ID_NONE}
+    {""                 , AV_CODEC_ID_NONE}
 };
 
 const CodecMime ff_mkv_mime_tags[] = {
-    {"text/plain"                 , CODEC_ID_TEXT},
-    {"image/gif"                  , CODEC_ID_GIF},
-    {"image/jpeg"                 , CODEC_ID_MJPEG},
-    {"image/png"                  , CODEC_ID_PNG},
-    {"image/tiff"                 , CODEC_ID_TIFF},
-    {"application/x-truetype-font", CODEC_ID_TTF},
-    {"application/x-font"         , CODEC_ID_TTF},
+    {"text/plain"                 , AV_CODEC_ID_TEXT},
+    {"image/gif"                  , AV_CODEC_ID_GIF},
+    {"image/jpeg"                 , AV_CODEC_ID_MJPEG},
+    {"image/png"                  , AV_CODEC_ID_PNG},
+    {"image/tiff"                 , AV_CODEC_ID_TIFF},
+    {"application/x-truetype-font", AV_CODEC_ID_TTF},
+    {"application/x-font"         , AV_CODEC_ID_TTF},
 
-    {""                           , CODEC_ID_NONE}
+    {""                           , AV_CODEC_ID_NONE}
 };
 
 const AVMetadataConv ff_mkv_metadata_conv[] = {