avformat/asfenc: Deduplicate codec tags lists

Also saves relocations.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2021-02-18 01:24:24 +01:00
parent 6cb6ee754b
commit c50c85911e

View File

@ -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 */