diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-28 01:32:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-28 02:03:56 +0100 |
| commit | 2754dbb6e151732f9d27fcc483e6701f010b5451 (patch) | |
| tree | aaddf69edea4684535329bcabd61ce677cae1cd0 /libavformat/nut.c | |
| parent | 3a227f5d904265313fa89cdafb3161bdf261fd50 (diff) | |
nut: put nut PCM audio tags in front of avi tags.
This fixes correctly storing and identifying PCM in nut.
Based on patch by Luca Barbato
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/nut.c')
| -rw-r--r-- | libavformat/nut.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libavformat/nut.c b/libavformat/nut.c index a670449c99..fc300fe378 100644 --- a/libavformat/nut.c +++ b/libavformat/nut.c @@ -146,9 +146,13 @@ const AVCodecTag ff_nut_video_tags[] = { { AV_CODEC_ID_NONE , 0 } }; -const AVCodecTag ff_nut_audio_tags[] = { +static const AVCodecTag 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_NONE, 0 } +}; + +const AVCodecTag ff_nut_audio_tags[] = { { AV_CODEC_ID_PCM_F32BE, MKTAG(32 , 'D', 'F', 'P') }, { AV_CODEC_ID_PCM_F32LE, MKTAG('P', 'F', 'D', 32 ) }, { AV_CODEC_ID_PCM_F64BE, MKTAG(64 , 'D', 'F', 'P') }, @@ -176,8 +180,8 @@ const AVCodecTag ff_nut_audio_tags[] = { }; const AVCodecTag * const ff_nut_codec_tags[] = { - ff_nut_video_tags, ff_nut_subtitle_tags, - ff_codec_bmp_tags, ff_codec_wav_tags, ff_nut_audio_tags, ff_nut_data_tags, 0 + 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 }; void ff_nut_reset_ts(NUTContext *nut, AVRational time_base, int64_t val){ |