generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/movenc: Check ff_put_wav_header() return code

Browse Source 
Fixes CID1212260
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-05-10 03:36:04 +02:00
parent 8cc6e91f69
commit dc6b99d6b2
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/movenc.c
View File

@@ -397,20 +397,24 @@ static int mov_pcm_be_gt16(enum AVCodecID codec_id)
static int mov_write_ms_tag(AVIOContext *pb, MOVTrack *track) static int mov_write_ms_tag(AVIOContext *pb, MOVTrack *track)
{ {
int ret;
int64_t pos = avio_tell(pb); int64_t pos = avio_tell(pb);
avio_wb32(pb, 0); avio_wb32(pb, 0);
avio_wl32(pb, track->tag); // store it byteswapped avio_wl32(pb, track->tag); // store it byteswapped
track->enc->codec_tag = av_bswap16(track->tag >> 16); track->enc->codec_tag = av_bswap16(track->tag >> 16);
ff_put_wav_header(pb, track->enc, 0); if ((ret = ff_put_wav_header(pb, track->enc, 0)) < 0)
return ret;
return update_size(pb, pos); return update_size(pb, pos);
} }
static int mov_write_wfex_tag(AVIOContext *pb, MOVTrack *track) static int mov_write_wfex_tag(AVIOContext *pb, MOVTrack *track)
{ {
int ret;
int64_t pos = avio_tell(pb); int64_t pos = avio_tell(pb);
avio_wb32(pb, 0); avio_wb32(pb, 0);
ffio_wfourcc(pb, "wfex"); ffio_wfourcc(pb, "wfex");
ff_put_wav_header(pb, track->enc, FF_PUT_WAV_HEADER_FORCE_WAVEFORMATEX); if ((ret = ff_put_wav_header(pb, track->enc, FF_PUT_WAV_HEADER_FORCE_WAVEFORMATEX)) < 0)
return ret;
return update_size(pb, pos); return update_size(pb, pos);
} }