@@ -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,
@@ -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];
@@ -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,
};
@@ -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,
};
Also saves a relocation. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> --- libavformat/oma.c | 3 +++ libavformat/oma.h | 1 + libavformat/omadec.c | 2 +- libavformat/omaenc.c | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-)