diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2013-03-12 15:56:52 +0100 |
|---|---|---|
| committer | Nicolas George <nicolas.george@normalesup.org> | 2013-03-12 16:21:22 +0100 |
| commit | b52421940f5c764237d484c5d578ebc2b1c136c5 (patch) | |
| tree | da512cfe73ad70cf1fd42685ba494a53883b0542 | |
| parent | 7787a6c7caa0a3bdca3b479286def754e6f56cf0 (diff) | |
| download | ffmpeg-b52421940f5c764237d484c5d578ebc2b1c136c5.tar.gz | |
lavf: add AV_ to two remaining CODEC_ID_*.
| -rw-r--r-- | libavformat/mxfdec.c | 2 | ||||
| -rw-r--r-- | libavformat/tedcaptionsdec.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index f7aaa5a9de..7dfdbfd2fb 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -1602,7 +1602,7 @@ static int mxf_parse_structural_metadata(MXFContext *mxf) st->codec->extradata = av_mallocz(descriptor->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); if (st->codec->extradata) memcpy(st->codec->extradata, descriptor->extradata, descriptor->extradata_size); - } else if(st->codec->codec_id == CODEC_ID_H264) { + } else if(st->codec->codec_id == AV_CODEC_ID_H264) { ff_generate_avci_extradata(st); } if (st->codec->codec_type != AVMEDIA_TYPE_DATA && (*essence_container_ul)[15] > 0x01) { diff --git a/libavformat/tedcaptionsdec.c b/libavformat/tedcaptionsdec.c index 85bed0a9ac..048ba96981 100644 --- a/libavformat/tedcaptionsdec.c +++ b/libavformat/tedcaptionsdec.c @@ -295,7 +295,7 @@ static av_cold int tedcaptions_read_header(AVFormatContext *avf) if (!st) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE; - st->codec->codec_id = CODEC_ID_TEXT; + st->codec->codec_id = AV_CODEC_ID_TEXT; avpriv_set_pts_info(st, 64, 1, 1000); st->probe_packets = 0; st->start_time = 0; |