diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2012-10-12 17:29:43 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2012-10-13 12:33:18 +0200 |
| commit | 92281850a2d878dae1d50e271886ba87013b6ff3 (patch) | |
| tree | 323ea7848bef448d41666fa19b76df426dd8a1d0 /libavformat/nutdec.c | |
| parent | 1bd442c276e6688b43777a198cad0d7e3a92123f (diff) | |
| download | ffmpeg-92281850a2d878dae1d50e271886ba87013b6ff3.tar.gz | |
nut: support pcm codecs not mapped in avi
The native tags will be used when available.
Diffstat (limited to 'libavformat/nutdec.c')
| -rw-r--r-- | libavformat/nutdec.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index 8448e13702..9b1891f92e 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -358,7 +358,12 @@ static int decode_stream_header(NUTContext *nut) break; case 1: st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = ff_codec_get_id(ff_codec_wav_tags, tmp); + st->codec->codec_id = av_codec_get_id((const AVCodecTag * const []) { + ff_nut_audio_tags, + ff_codec_wav_tags, + 0 + }, + tmp); break; case 2: st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE; |