diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-02-18 01:24:24 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-02-23 10:14:26 +0100 |
| commit | c50c85911ef7a6496953afe9975115139e49b187 (patch) | |
| tree | 9749927ab1c25d19da7f4ffdbfc8e5fd08dbfbb3 /libavformat | |
| parent | 6cb6ee754be7d4abed06b98a535e3012ddab4f8a (diff) | |
| download | ffmpeg-c50c85911ef7a6496953afe9975115139e49b187.tar.gz | |
avformat/asfenc: Deduplicate codec tags lists
Also saves relocations.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/asfenc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c index 8b24264c94..23a09efe05 100644 --- a/libavformat/asfenc.c +++ b/libavformat/asfenc.c @@ -258,6 +258,10 @@ static const AVCodecTag codec_asf_bmp_tags[] = { { AV_CODEC_ID_NONE, 0 }, }; +static const AVCodecTag *const asf_codec_tags[] = { + codec_asf_bmp_tags, ff_codec_bmp_tags, ff_codec_wav_tags, NULL +}; + #define PREROLL_TIME 3100 static void put_str16(AVIOContext *s, const char *tag) @@ -1170,9 +1174,7 @@ AVOutputFormat ff_asf_muxer = { .write_packet = asf_write_packet, .write_trailer = asf_write_trailer, .flags = AVFMT_GLOBALHEADER, - .codec_tag = (const AVCodecTag * const []) { - codec_asf_bmp_tags, ff_codec_bmp_tags, ff_codec_wav_tags, 0 - }, + .codec_tag = asf_codec_tags, .priv_class = &asf_muxer_class, }; #endif /* CONFIG_ASF_MUXER */ @@ -1197,9 +1199,7 @@ AVOutputFormat ff_asf_stream_muxer = { .write_packet = asf_write_packet, .write_trailer = asf_write_trailer, .flags = AVFMT_GLOBALHEADER, - .codec_tag = (const AVCodecTag * const []) { - codec_asf_bmp_tags, ff_codec_bmp_tags, ff_codec_wav_tags, 0 - }, + .codec_tag = asf_codec_tags, .priv_class = &asf_stream_muxer_class, }; #endif /* CONFIG_ASF_STREAM_MUXER */ |