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 <z...@zanevaniperen.com>
---
libavformat/riffenc.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/libavformat/riffenc.c b/libavformat/riffenc.c
index 04a21fcffa..33e0b6fc0a 100644
--- a/libavformat/riffenc.c
+++ b/libavformat/riffenc.c
@@ -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(s->streams[0]->codecpar->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. */
--
2.28.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
