virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avformat/riff: prevent muxing adpcm_swf with a variable block size

Browse Source 
Prefer to error than to create a broken file. Closes ticket #5829.

Effectively disables remuxing adpcm_swf from flv -> wav.

Signed-off-by: Zane van Iperen <zane@zanevaniperen.com>
This commit is contained in:
Zane van Iperen 2020-10-16 00:02:18 +10:00
parent 637c154a50
commit 53ac499f01
No known key found for this signature in database
GPG Key ID: 68616B2D8AC4DCC5
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/riffenc.c
View File

@ -65,6 +65,12 @@ int ff_put_wav_header(AVFormatContext *s, AVIOContext *pb,
if (!par->codec_tag || par->codec_tag > 0xffff)
return -1;
if (par->codec_id == AV_CODEC_ID_ADPCM_SWF && par->block_align == 0) {
av_log(s, AV_LOG_ERROR, "%s can only be written to WAVE with a constant frame size\n",
avcodec_get_name(par->codec_id));
return AVERROR(EINVAL);
}
/* We use the known constant frame size for the codec if known, otherwise
* fall back on using AVCodecContext.frame_size, which is not as reliable
* for indicating packet duration. */