diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-14 21:56:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-14 22:24:00 +0200 |
| commit | bd4ebbbbed47761df65dd574dce6d3c56d29e2e7 (patch) | |
| tree | 415ffb3c9ed9507a7c6ae115e1c201a85271e4ed /libavformat/riff.c | |
| parent | 4b9e9a57eeadf1ece872b19a433b3c004aaa5e46 (diff) | |
| parent | 05c8f119cc6b5727319c56b055af82ac1ded93b5 (diff) | |
| download | ffmpeg-bd4ebbbbed47761df65dd574dce6d3c56d29e2e7.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
proresdsp: fix function prototypes.
prores-idct: fix overflow in c code.
fate: update prores-alpha ref after changing pix_fmt to yuv444p10le
prores: add missing feature warning for alpha
mov: 10l: Terminate string with 0 not '0'
mov: Prevent illegal writes when chapter titles are very short.
prores: add appropriate -fix_fmt parameter to FATE command
riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header
lavc: add a flag-based error_recognition field to AVCodecContext and deprecate non-flag-based ER field
lavc: rename deprecation symbol FF_API_VERY_AGGRESSIVE to FF_API_ER
Conflicts:
libavcodec/avcodec.h
libavformat/mov.c
tests/fate/prores.mak
tests/ref/acodec/g726
tests/ref/fate/prores-alpha
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/riff.c')
| -rw-r--r-- | libavformat/riff.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index 2995e0dd82..a6cf8b4197 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -452,8 +452,6 @@ int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc) riff_extradata_start= enc->extradata; riff_extradata= enc->extradata + enc->extradata_size; hdrsize += enc->extradata_size; - } else if (!waveformatextensible){ - hdrsize -= 2; } if(waveformatextensible) { /* write WAVEFORMATEXTENSIBLE extensions */ hdrsize += 22; @@ -464,8 +462,8 @@ int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc) avio_wl32(pb, 0x00100000); avio_wl32(pb, 0xAA000080); avio_wl32(pb, 0x719B3800); - } else if(riff_extradata - riff_extradata_start) { - avio_wl16(pb, riff_extradata - riff_extradata_start); + } else { + avio_wl16(pb, riff_extradata - riff_extradata_start); /* cbSize */ } avio_write(pb, riff_extradata_start, riff_extradata - riff_extradata_start); if(hdrsize&1){ |