[FFmpeg-cvslog] wtvenc: output ff_format_none if ff_put_wav_header fails
Peter Ross
git at videolan.org
Mon Dec 23 21:20:54 CET 2013
ffmpeg | branch: master | Peter Ross <pross at xvid.org> | Mon Dec 23 20:39:50 2013 +1100| [e93a73cbef53856596db895a7abede62d0ffab7e] | committer: Michael Niedermayer
wtvenc: output ff_format_none if ff_put_wav_header fails
This occurs when muxing E-AC-3.
Signed-off-by: Peter Ross <pross at xvid.org>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e93a73cbef53856596db895a7abede62d0ffab7e
---
libavformat/wtvenc.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libavformat/wtvenc.c b/libavformat/wtvenc.c
index c1066e1..5e3b9b9 100644
--- a/libavformat/wtvenc.c
+++ b/libavformat/wtvenc.c
@@ -298,7 +298,8 @@ static int write_stream_codec_info(AVFormatContext *s, AVStream *st)
if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
put_videoinfoheader2(pb, st);
} else {
- ff_put_wav_header(pb, st->codec);
+ if (ff_put_wav_header(pb, st->codec) < 0)
+ format_type = &ff_format_none;
}
hdr_size = avio_tell(pb) - hdr_pos_start;
More information about the ffmpeg-cvslog
mailing list