diff options
author | Anton Khirnov <anton@khirnov.net> | 2012-08-05 11:11:04 +0200 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2012-08-07 16:00:24 +0200 |
commit | 36ef5369ee9b336febc2c270f8718cec4476cb85 (patch) | |
tree | d186adbb488e7f002aa894743b1ce0e8925520e6 /libavformat/output-example.c | |
parent | 104e10fb426f903ba9157fdbfe30292d0e4c3d72 (diff) | |
download | ffmpeg-36ef5369ee9b336febc2c270f8718cec4476cb85.tar.gz |
Replace all CODEC_ID_* with AV_CODEC_ID_*
Diffstat (limited to 'libavformat/output-example.c')
-rw-r--r-- | libavformat/output-example.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/output-example.c b/libavformat/output-example.c index 9dc811ca15..27950a162b 100644 --- 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); } |