avformat/oma: Deduplicate codec tags list

Also saves a relocation.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>

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

diff --git a/libavformat/oma.h b/libavformat/oma.h
index 36fd0125e49f5e67ad5f87e1c85b18d157503483..5df50c8eb4b07ad4aecad3bc1ebee0ec28a8458f 100644 (file)
--- a/libavformat/oma.h
+++ b/libavformat/oma.h
@@ -42,6 +42,7 @@ enum {
 extern const uint16_t ff_oma_srate_tab[8];
 
 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 int ff_oma_chid_to_num_channels[7];

diff --git a/libavformat/omadec.c b/libavformat/omadec.c
index 5675d86e75e78ff47de8a12c3cb43590077c86ef..0b36d4e867dae1627b6ab48dfd2f8369e409efb3 100644 (file)
--- a/libavformat/omadec.c
+++ b/libavformat/omadec.c
@@ -621,5 +621,5 @@ AVInputFormat ff_oma_demuxer = {
     .read_close     = oma_read_close,
     .flags          = AVFMT_GENERIC_INDEX,
     .extensions     = "oma,omg,aa3",
-    .codec_tag      = (const AVCodecTag* const []){ff_oma_codec_tags, 0},
+    .codec_tag      = ff_oma_codec_tags_list,
 };

diff --git a/libavformat/omaenc.c b/libavformat/omaenc.c
index 7952808bf862b2ce630ccec344ac9effa6d5a3d1..d3c4f62027f0ff83a88da73e8fc79f65c7146b99 100644 (file)
--- a/libavformat/omaenc.c
+++ b/libavformat/omaenc.c
@@ -102,6 +102,6 @@ AVOutputFormat ff_oma_muxer = {
     .audio_codec       = AV_CODEC_ID_ATRAC3,
     .write_header      = oma_write_header,
     .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,
 };