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/avienc.c | |
| parent | 104e10fb426f903ba9157fdbfe30292d0e4c3d72 (diff) | |
| download | ffmpeg-36ef5369ee9b336febc2c270f8718cec4476cb85.tar.gz | |
Replace all CODEC_ID_* with AV_CODEC_ID_*
Diffstat (limited to 'libavformat/avienc.c')
| -rw-r--r-- | libavformat/avienc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/avienc.c b/libavformat/avienc.c index 38c9d9d1e8..40fd7adda8 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -234,7 +234,7 @@ static int avi_write_header(AVFormatContext *s) case AVMEDIA_TYPE_SUBTITLE: // XSUB subtitles behave like video tracks, other subtitles // are not (yet) supported. - if (stream->codec_id != CODEC_ID_XSUB) { + if (stream->codec_id != AV_CODEC_ID_XSUB) { av_log(s, AV_LOG_ERROR, "Subtitle streams other than DivX XSUB are not supported by the AVI muxer.\n"); return AVERROR_PATCHWELCOME; } @@ -244,7 +244,7 @@ static int avi_write_header(AVFormatContext *s) case AVMEDIA_TYPE_DATA : ffio_wfourcc(pb, "dats"); break; } if(stream->codec_type == AVMEDIA_TYPE_VIDEO || - stream->codec_id == CODEC_ID_XSUB) + stream->codec_id == AV_CODEC_ID_XSUB) avio_wl32(pb, stream->codec_tag); else avio_wl32(pb, 1); @@ -286,7 +286,7 @@ static int avi_write_header(AVFormatContext *s) case AVMEDIA_TYPE_SUBTITLE: // XSUB subtitles behave like video tracks, other subtitles // are not (yet) supported. - if (stream->codec_id != CODEC_ID_XSUB) break; + if (stream->codec_id != AV_CODEC_ID_XSUB) break; case AVMEDIA_TYPE_VIDEO: ff_put_bmp_header(pb, stream, ff_codec_bmp_tags, 0); break; @@ -615,7 +615,7 @@ static int avi_write_trailer(AVFormatContext *s) if (nb_frames < avist->packet_count) nb_frames = avist->packet_count; } else { - if (stream->codec_id == CODEC_ID_MP2 || stream->codec_id == CODEC_ID_MP3) { + if (stream->codec_id == AV_CODEC_ID_MP2 || stream->codec_id == AV_CODEC_ID_MP3) { nb_frames += avist->packet_count; } } @@ -645,8 +645,8 @@ AVOutputFormat ff_avi_muxer = { .mime_type = "video/x-msvideo", .extensions = "avi", .priv_data_size = sizeof(AVIContext), - .audio_codec = CONFIG_LIBMP3LAME ? CODEC_ID_MP3 : CODEC_ID_AC3, - .video_codec = CODEC_ID_MPEG4, + .audio_codec = CONFIG_LIBMP3LAME ? AV_CODEC_ID_MP3 : AV_CODEC_ID_AC3, + .video_codec = AV_CODEC_ID_MPEG4, .write_header = avi_write_header, .write_packet = avi_write_packet, .write_trailer = avi_write_trailer, |