From ba0d785fa52a4cc81f9121c4ade59cad9f557ac1 Mon Sep 17 00:00:00 2001 From: Limin Wang Date: Tue, 21 Apr 2020 23:35:23 +0800 Subject: avformat/utils: move is_intra_only() to header and rename to ff_is_intra_only() Signed-off-by: Limin Wang --- libavformat/internal.h | 2 ++ libavformat/utils.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'libavformat') diff --git a/libavformat/internal.h b/libavformat/internal.h index 45a4149c5a..831397087f 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -510,6 +510,8 @@ unsigned int ff_codec_get_tag(const AVCodecTag *tags, enum AVCodecID id); enum AVCodecID ff_codec_get_id(const AVCodecTag *tags, unsigned int tag); +int ff_is_intra_only(enum AVCodecID id); + /** * Select a PCM codec based on the given parameters. * diff --git a/libavformat/utils.c b/libavformat/utils.c index 44109d866d..e6158d8058 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1011,7 +1011,7 @@ FF_ENABLE_DEPRECATION_WARNINGS } } -static int is_intra_only(enum AVCodecID id) +int ff_is_intra_only(enum AVCodecID id) { const AVCodecDescriptor *d = avcodec_descriptor_get(id); if (!d) @@ -1410,7 +1410,7 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, presentation_delayed, delay, av_ts2str(pkt->pts), av_ts2str(pkt->dts), av_ts2str(st->cur_dts), st->index, st->id); /* update flags */ - if (st->codecpar->codec_type == AVMEDIA_TYPE_DATA || is_intra_only(st->codecpar->codec_id)) + if (st->codecpar->codec_type == AVMEDIA_TYPE_DATA || ff_is_intra_only(st->codecpar->codec_id)) pkt->flags |= AV_PKT_FLAG_KEY; #if FF_API_CONVERGENCE_DURATION FF_DISABLE_DEPRECATION_WARNINGS -- cgit v1.2.3