Browse Source

avformat/rso: Deduplicate codec tags list

Also saves a relocation.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
tags/n4.4
Andreas Rheinhardt 4 years ago
parent
commit
cccb7cf44e
4 changed files with 5 additions and 2 deletions
  1. +2
    -0
      libavformat/rso.c
  2. +1
    -0
      libavformat/rso.h
  3. +1
    -1
      libavformat/rsodec.c
  4. +1
    -1
      libavformat/rsoenc.c

+ 2
- 0
libavformat/rso.c View File

@@ -28,3 +28,5 @@ const AVCodecTag ff_codec_rso_tags[] = {
{ AV_CODEC_ID_ADPCM_IMA_WAV, 0x0101 }, { AV_CODEC_ID_ADPCM_IMA_WAV, 0x0101 },
{ AV_CODEC_ID_NONE, 0 }, { AV_CODEC_ID_NONE, 0 },
}; };

const AVCodecTag *const ff_rso_codec_tags_list[] = { ff_codec_rso_tags, NULL };

+ 1
- 0
libavformat/rso.h View File

@@ -28,5 +28,6 @@


/* The libavcodec codecs we support, and the IDs they have in the file */ /* The libavcodec codecs we support, and the IDs they have in the file */
extern const AVCodecTag ff_codec_rso_tags[]; extern const AVCodecTag ff_codec_rso_tags[];
extern const AVCodecTag *const ff_rso_codec_tags_list[];


#endif /* AVFORMAT_RSO_H */ #endif /* AVFORMAT_RSO_H */

+ 1
- 1
libavformat/rsodec.c View File

@@ -79,5 +79,5 @@ AVInputFormat ff_rso_demuxer = {
.read_header = rso_read_header, .read_header = rso_read_header,
.read_packet = ff_pcm_read_packet, .read_packet = ff_pcm_read_packet,
.read_seek = ff_pcm_read_seek, .read_seek = ff_pcm_read_seek,
.codec_tag = (const AVCodecTag* const []){ff_codec_rso_tags, 0},
.codec_tag = ff_rso_codec_tags_list,
}; };

+ 1
- 1
libavformat/rsoenc.c View File

@@ -100,6 +100,6 @@ AVOutputFormat ff_rso_muxer = {
.write_header = rso_write_header, .write_header = rso_write_header,
.write_packet = ff_raw_write_packet, .write_packet = ff_raw_write_packet,
.write_trailer = rso_write_trailer, .write_trailer = rso_write_trailer,
.codec_tag = (const AVCodecTag* const []){ff_codec_rso_tags, 0},
.codec_tag = ff_rso_codec_tags_list,
.flags = AVFMT_NOTIMESTAMPS, .flags = AVFMT_NOTIMESTAMPS,
}; };

Loading…
Cancel
Save