highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/oma: Deduplicate codec tags list

Browse Source 
Also saves a relocation.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2021-02-18 01:51:41 +01:00
parent cccb7cf44e
commit 81a86c7e1e
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/oma.c
View File

@ -18,6 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <stddef.h>
#include "internal.h" #include "internal.h"
#include "oma.h" #include "oma.h"
#include "libavcodec/avcodec.h" #include "libavcodec/avcodec.h"
@ -35,6 +36,8 @@ const AVCodecTag ff_oma_codec_tags[] = {
{ 0 }, { 0 },
}; };
const AVCodecTag *const ff_oma_codec_tags_list[] = { ff_oma_codec_tags, NULL };
/** map ATRAC-X channel id to internal channel layout */ /** map ATRAC-X channel id to internal channel layout */
const uint64_t ff_oma_chid_to_native_layout[7] = { const uint64_t ff_oma_chid_to_native_layout[7] = {
AV_CH_LAYOUT_MONO, AV_CH_LAYOUT_MONO,

1
libavformat/oma.h
View File

@ -42,6 +42,7 @@ enum {
extern const uint16_t ff_oma_srate_tab[8]; extern const uint16_t ff_oma_srate_tab[8];
extern const AVCodecTag ff_oma_codec_tags[]; extern const AVCodecTag ff_oma_codec_tags[];
extern const AVCodecTag *const ff_oma_codec_tags_list[];
extern const uint64_t ff_oma_chid_to_native_layout[7]; extern const uint64_t ff_oma_chid_to_native_layout[7];
extern const int ff_oma_chid_to_num_channels[7]; extern const int ff_oma_chid_to_num_channels[7];

2
libavformat/omadec.c
View File

@ -621,5 +621,5 @@ AVInputFormat ff_oma_demuxer = {
.read_close = oma_read_close, .read_close = oma_read_close,
.flags = AVFMT_GENERIC_INDEX, .flags = AVFMT_GENERIC_INDEX,
.extensions = "oma,omg,aa3", .extensions = "oma,omg,aa3",
.codec_tag = (const AVCodecTag* const []){ff_oma_codec_tags, 0}, .codec_tag = ff_oma_codec_tags_list,
}; };

2
libavformat/omaenc.c
View File

@ -102,6 +102,6 @@ AVOutputFormat ff_oma_muxer = {
.audio_codec = AV_CODEC_ID_ATRAC3, .audio_codec = AV_CODEC_ID_ATRAC3,
.write_header = oma_write_header, .write_header = oma_write_header,
.write_packet = ff_raw_write_packet, .write_packet = ff_raw_write_packet,
.codec_tag = (const AVCodecTag* const []){ff_oma_codec_tags, 0}, .codec_tag = ff_oma_codec_tags_list,
.flags = AVFMT_NOTIMESTAMPS, .flags = AVFMT_NOTIMESTAMPS,
}; };