diff options
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/ffmdec.c | 4 | ||||
| -rw-r--r-- | libavformat/ffmenc.c | 2 | ||||
| -rw-r--r-- | libavformat/mov.c | 2 | ||||
| -rw-r--r-- | libavformat/mux.c | 4 | ||||
| -rw-r--r-- | libavformat/sdp.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c index 9b50c9f5a6..7af1bd3cf4 100644 --- a/libavformat/ffmdec.c +++ b/libavformat/ffmdec.c @@ -326,7 +326,7 @@ static int ffm2_read_header(AVFormatContext *s) codec->flags = avio_rb32(pb); codec->flags2 = avio_rb32(pb); codec->debug = avio_rb32(pb); - if (codec->flags & CODEC_FLAG_GLOBAL_HEADER) { + if (codec->flags & AV_CODEC_FLAG_GLOBAL_HEADER) { if (ff_get_extradata(codec, pb, avio_rb32(pb)) < 0) return AVERROR(ENOMEM); } @@ -573,7 +573,7 @@ static int ffm_read_header(AVFormatContext *s) default: goto fail; } - if (codec->flags & CODEC_FLAG_GLOBAL_HEADER) { + if (codec->flags & AV_CODEC_FLAG_GLOBAL_HEADER) { if (ff_get_extradata(codec, pb, avio_rb32(pb)) < 0) return AVERROR(ENOMEM); } diff --git a/libavformat/ffmenc.c b/libavformat/ffmenc.c index 3abbfdd08f..f0b5743ea4 100644 --- a/libavformat/ffmenc.c +++ b/libavformat/ffmenc.c @@ -268,7 +268,7 @@ static int ffm_write_header(AVFormatContext *s) avio_wb32(pb, codec->flags); avio_wb32(pb, codec->flags2); avio_wb32(pb, codec->debug); - if (codec->flags & CODEC_FLAG_GLOBAL_HEADER) { + if (codec->flags & AV_CODEC_FLAG_GLOBAL_HEADER) { avio_wb32(pb, codec->extradata_size); avio_write(pb, codec->extradata, codec->extradata_size); } diff --git a/libavformat/mov.c b/libavformat/mov.c index 92bf2f8940..1624d4e10c 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1927,7 +1927,7 @@ static int mov_parse_stsd_data(MOVContext *c, AVIOContext *pb, val = AV_RB32(st->codec->extradata + 4); tmcd_ctx->tmcd_flags = val; if (val & 1) - st->codec->flags2 |= CODEC_FLAG2_DROP_FRAME_TIMECODE; + st->codec->flags2 |= AV_CODEC_FLAG2_DROP_FRAME_TIMECODE; st->codec->time_base.den = st->codec->extradata[16]; /* number of frame */ st->codec->time_base.num = 1; /* adjust for per frame dur in counter mode */ diff --git a/libavformat/mux.c b/libavformat/mux.c index f99dbd9c07..909617fd5d 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -251,7 +251,7 @@ static int init_muxer(AVFormatContext *s, AVDictionary **options) goto fail; #if FF_API_LAVF_BITEXACT - if (s->nb_streams && s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT) + if (s->nb_streams && s->streams[0]->codec->flags & AV_CODEC_FLAG_BITEXACT) s->flags |= AVFMT_FLAG_BITEXACT; #endif @@ -348,7 +348,7 @@ FF_ENABLE_DEPRECATION_WARNINGS } if (of->flags & AVFMT_GLOBALHEADER && - !(codec->flags & CODEC_FLAG_GLOBAL_HEADER)) + !(codec->flags & AV_CODEC_FLAG_GLOBAL_HEADER)) av_log(s, AV_LOG_WARNING, "Codec for stream %d does not use global headers " "but container format requires global headers\n", i); diff --git a/libavformat/sdp.c b/libavformat/sdp.c index 4d621c7ffc..45974b394f 100644 --- a/libavformat/sdp.c +++ b/libavformat/sdp.c @@ -685,7 +685,7 @@ static char *sdp_write_media_attributes(char *buff, int size, AVCodecContext *c, const char *mode; uint64_t vad_option; - if (c->flags & CODEC_FLAG_QSCALE) + if (c->flags & AV_CODEC_FLAG_QSCALE) mode = "on"; else if (!av_opt_get_int(c, "vad", AV_OPT_FLAG_ENCODING_PARAM, &vad_option) && vad_option) mode = "vad"; |