diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-02-18 01:42:14 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-02-23 11:23:29 +0100 |
| commit | e772e253cbaa9cbbc55b8fd62e1e7534c4fab8d8 (patch) | |
| tree | 89c03c2e830b77058d26ea486429961df0d48ddf | |
| parent | ef3224c911cca43700f1df7fbee3741a320afe28 (diff) | |
| download | ffmpeg-e772e253cbaa9cbbc55b8fd62e1e7534c4fab8d8.tar.gz | |
avformat/voc: Deduplicate codec tags list
Also saves a relocation.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
| -rw-r--r-- | libavformat/voc.c | 2 | ||||
| -rw-r--r-- | libavformat/voc.h | 1 | ||||
| -rw-r--r-- | libavformat/vocdec.c | 2 | ||||
| -rw-r--r-- | libavformat/vocenc.c | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/libavformat/voc.c b/libavformat/voc.c index 2a972344d3..e4cdf8bf49 100644 --- a/libavformat/voc.c +++ b/libavformat/voc.c @@ -35,3 +35,5 @@ const AVCodecTag ff_voc_codec_tags[] = { {AV_CODEC_ID_ADPCM_CT, 0x0200}, {AV_CODEC_ID_NONE, 0}, }; + +const AVCodecTag *const ff_voc_codec_tags_list[] = { ff_voc_codec_tags, NULL }; diff --git a/libavformat/voc.h b/libavformat/voc.h index 1f9a8be000..1fc6bb4227 100644 --- a/libavformat/voc.h +++ b/libavformat/voc.h @@ -45,6 +45,7 @@ typedef enum voc_type { extern const unsigned char ff_voc_magic[21]; extern const AVCodecTag ff_voc_codec_tags[]; +extern const AVCodecTag *const ff_voc_codec_tags_list[]; int ff_voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size); diff --git a/libavformat/vocdec.c b/libavformat/vocdec.c index d388fce92e..6cdc720ee7 100644 --- a/libavformat/vocdec.c +++ b/libavformat/vocdec.c @@ -106,5 +106,5 @@ AVInputFormat ff_voc_demuxer = { .read_header = voc_read_header, .read_packet = voc_read_packet, .read_seek = voc_read_seek, - .codec_tag = (const AVCodecTag* const []){ ff_voc_codec_tags, 0 }, + .codec_tag = ff_voc_codec_tags_list, }; diff --git a/libavformat/vocenc.c b/libavformat/vocenc.c index 321b113032..bdc63843c4 100644 --- a/libavformat/vocenc.c +++ b/libavformat/vocenc.c @@ -106,6 +106,6 @@ AVOutputFormat ff_voc_muxer = { .write_header = voc_write_header, .write_packet = voc_write_packet, .write_trailer = voc_write_trailer, - .codec_tag = (const AVCodecTag* const []){ ff_voc_codec_tags, 0 }, + .codec_tag = ff_voc_codec_tags_list, .flags = AVFMT_NOTIMESTAMPS, }; |