diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-09 23:37:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-09 23:37:55 +0200 |
| commit | 968516cebf89fa2dcf7e112e4ab56145fb0d584b (patch) | |
| tree | 6e218aabfe5b379192f4aff934927544ae737dd6 | |
| parent | f703dae7aa76ea9ac4c5f578a0d2def94d90191e (diff) | |
avformat/nut: add ff_nut_audio_extra_tags to demuxer too
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/nut.c | 4 | ||||
| -rw-r--r-- | libavformat/nut.h | 1 | ||||
| -rw-r--r-- | libavformat/nutdec.c | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/nut.c b/libavformat/nut.c index 2447abbe54..6983af0523 100644 --- a/libavformat/nut.c +++ b/libavformat/nut.c @@ -176,7 +176,7 @@ const AVCodecTag ff_nut_video_tags[] = { { AV_CODEC_ID_NONE, 0 } }; -static const AVCodecTag nut_audio_extra_tags[] = { +const AVCodecTag ff_nut_audio_extra_tags[] = { { AV_CODEC_ID_PCM_ALAW, MKTAG('A', 'L', 'A', 'W') }, { AV_CODEC_ID_PCM_MULAW, MKTAG('U', 'L', 'A', 'W') }, { AV_CODEC_ID_MP3, MKTAG('M', 'P', '3', ' ') }, @@ -212,7 +212,7 @@ const AVCodecTag ff_nut_audio_tags[] = { const AVCodecTag * const ff_nut_codec_tags[] = { ff_nut_video_tags, ff_nut_audio_tags, ff_nut_subtitle_tags, - ff_codec_bmp_tags, ff_codec_wav_tags, nut_audio_extra_tags, ff_nut_data_tags, 0 + ff_codec_bmp_tags, ff_codec_wav_tags, ff_nut_audio_extra_tags, ff_nut_data_tags, 0 }; void ff_nut_reset_ts(NUTContext *nut, AVRational time_base, int64_t val) diff --git a/libavformat/nut.h b/libavformat/nut.h index 29f28e6ab9..a08d30b935 100644 --- a/libavformat/nut.h +++ b/libavformat/nut.h @@ -112,6 +112,7 @@ typedef struct NUTContext { extern const AVCodecTag ff_nut_subtitle_tags[]; extern const AVCodecTag ff_nut_video_tags[]; extern const AVCodecTag ff_nut_audio_tags[]; +extern const AVCodecTag ff_nut_audio_extra_tags[]; extern const AVCodecTag ff_nut_data_tags[]; extern const AVCodecTag * const ff_nut_codec_tags[]; diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index 5746416180..5d08a8e80b 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -390,6 +390,7 @@ static int decode_stream_header(NUTContext *nut) st->codec->codec_id = av_codec_get_id((const AVCodecTag * const []) { ff_nut_audio_tags, ff_codec_wav_tags, + ff_nut_audio_extra_tags, 0 }, tmp); |