Replace all CODEC_ID_* with AV_CODEC_ID_*

[ffmpeg] / libavformat / output-example.c

diff --git a/libavformat/output-example.c b/libavformat/output-example.c
index 9dc811ca153cde57e8e3c7694b3099371652d8c5..27950a162b6c732dd6ad72b803c2c11d4335dbcf 100644 (file)
--- a/libavformat/output-example.c
+++ b/libavformat/output-example.c
@@ -58,7 +58,7 @@ static int audio_input_frame_size;
 /*
  * add an audio output stream
  */
-static AVStream *add_audio_stream(AVFormatContext *oc, enum CodecID codec_id)
+static AVStream *add_audio_stream(AVFormatContext *oc, enum AVCodecID codec_id)
 {
     AVCodecContext *c;
     AVStream *st;
@@ -182,7 +182,7 @@ static uint8_t *video_outbuf;
 static int frame_count, video_outbuf_size;
 
 /* Add a video output stream. */
-static AVStream *add_video_stream(AVFormatContext *oc, enum CodecID codec_id)
+static AVStream *add_video_stream(AVFormatContext *oc, enum AVCodecID codec_id)
 {
     AVCodecContext *c;
     AVStream *st;
@@ -216,11 +216,11 @@ static AVStream *add_video_stream(AVFormatContext *oc, enum CodecID codec_id)
     c->time_base.num = 1;
     c->gop_size      = 12; /* emit one intra frame every twelve frames at most */
     c->pix_fmt       = STREAM_PIX_FMT;
-    if (c->codec_id == CODEC_ID_MPEG2VIDEO) {
+    if (c->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
         /* just for testing, we also add B frames */
         c->max_b_frames = 2;
     }
-    if (c->codec_id == CODEC_ID_MPEG1VIDEO) {
+    if (c->codec_id == AV_CODEC_ID_MPEG1VIDEO) {
         /* Needed to avoid using macroblocks in which some coeffs overflow.
          * This does not happen with normal video, it just happens here as
          * the motion of the chroma plane does not match the luma plane. */
@@ -460,10 +460,10 @@ int main(int argc, char **argv)
      * and initialize the codecs. */
     video_st = NULL;
     audio_st = NULL;
-    if (fmt->video_codec != CODEC_ID_NONE) {
+    if (fmt->video_codec != AV_CODEC_ID_NONE) {
         video_st = add_video_stream(oc, fmt->video_codec);
     }
-    if (fmt->audio_codec != CODEC_ID_NONE) {
+    if (fmt->audio_codec != AV_CODEC_ID_NONE) {
         audio_st = add_audio_stream(oc, fmt->audio_codec);
     }