diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-14 14:38:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-14 14:46:13 +0200 |
| commit | 82c0055c5e71f2289936e6c2528bed5826c18c43 (patch) | |
| tree | e4510e6a8cf751182378f293f7a8bc4f253c0097 /libavformat/nutdec.c | |
| parent | db51c65961bd692fc6ebb12c2f4183699d3db9c0 (diff) | |
| parent | b5198a2637b7b45b0049a1d4b386a06f016f2520 (diff) | |
| download | ffmpeg-82c0055c5e71f2289936e6c2528bed5826c18c43.tar.gz | |
Merge commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520'
* commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520':
configure: tms470: add mapping for -mfpu=vfpv3-d16 flag
configure: recognise Minix as OS
configure: work around bug in ash shell
eval-test: make table static const
lavr: handle clipping in the float to s32 conversion
nut: support pcm codecs not mapped in avi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 1513f5dad5..cc18adc97d 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -369,7 +369,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; |