OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e4be076
)
wtvenc: output ff_format_none if ff_put_wav_header fails
author
Peter Ross
<pross@xvid.org>
Mon, 23 Dec 2013 09:39:50 +0000
(20:39 +1100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 23 Dec 2013 18:51:32 +0000
(19:51 +0100)
This occurs when muxing E-AC-3.
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/wtvenc.c
patch
|
blob
|
history
diff --git
a/libavformat/wtvenc.c
b/libavformat/wtvenc.c
index
c1066e1
..
5e3b9b9
100644
(file)
--- 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;