summaryrefslogtreecommitdiff
path: root/libavformat/isom.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-17 17:08:39 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-17 17:09:33 +0100
commitb6ad5893ce585ac6d0a5a4750cba6bb700dbc902 (patch)
tree5bceee675333be5b183707ca337393a3b2945134 /libavformat/isom.c
parentf6f3c85c0eff54cebc3a45caa7a1e0454b5c9ff8 (diff)
avformat/isom: only write the size if its non zero in mov_rewrite_dvd_sub_extradata()
Fixes regression with NeroRecodeSample.mp4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/isom.c')
-rw-r--r--libavformat/isom.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c
index d897808391..a38d39701b 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -464,8 +464,10 @@ static int mov_rewrite_dvd_sub_extradata(AVStream *st)
if (st->codec->extradata_size != 64)
return 0;
- snprintf(buf, sizeof(buf), "size: %dx%d\npalette: ",
- st->codec->width, st->codec->height);
+ if (st->codec->width > 0 && st->codec->height > 0)
+ snprintf(buf, sizeof(buf), "size: %dx%d\n",
+ st->codec->width, st->codec->height);
+ av_strlcat(buf, "palette: ", sizeof(buf));
for (i = 0; i < 16; i++) {
uint32_t yuv = AV_RB32(src + i * 4);