aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Ross <pross@xvid.org>2013-12-23 20:39:50 +1100
committerMichael Niedermayer <michaelni@gmx.at>2013-12-23 19:51:32 +0100
commite93a73cbef53856596db895a7abede62d0ffab7e (patch)
tree6d14b2e737f7d671083bc88c425d55d0c2c6858e
parente4be07657049fe11994a2698ae41a2e750b5b7f8 (diff)
downloadffmpeg-e93a73cbef53856596db895a7abede62d0ffab7e.tar.gz
wtvenc: output ff_format_none if ff_put_wav_header fails
This occurs when muxing E-AC-3. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/wtvenc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/wtvenc.c b/libavformat/wtvenc.c
index c1066e1b3d..5e3b9b9874 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;