Commit e772e253 authored by Andreas Rheinhardt's avatar Andreas Rheinhardt

avformat/voc: Deduplicate codec tags list

Also saves a relocation.
Signed-off-by: 's avatarAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
parent ef3224c9
......@@ -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 };
......@@ -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);
......
......@@ -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,
};
......@@ -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,
};
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment