aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2012-09-12 13:08:27 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2012-09-13 09:21:26 +0200
commit72791e41d40b30b76a86b56aa6bc1c300ecc6677 (patch)
tree6a0f3739424c10e11b4d8b1a52c83a9bb220698e
parent4155968fc6eb28f8e2275b462468b83bea25bfc5 (diff)
downloadffmpeg-72791e41d40b30b76a86b56aa6bc1c300ecc6677.tar.gz
Fix muxing mjpeg in swf.
(cherry picked from commit 7680d99b4302e476076cc1b8f2567f47c2aaef4d)
-rw-r--r--libavformat/swfenc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/swfenc.c b/libavformat/swfenc.c
index 6a3cdad09e..8177ffabf1 100644
--- a/libavformat/swfenc.c
+++ b/libavformat/swfenc.c
@@ -494,8 +494,10 @@ static int swf_write_trailer(AVFormatContext *s)
avio_wl32(pb, file_size);
avio_seek(pb, swf->duration_pos, SEEK_SET);
avio_wl16(pb, swf->video_frame_number);
+ if (swf->vframes_pos) {
avio_seek(pb, swf->vframes_pos, SEEK_SET);
avio_wl16(pb, swf->video_frame_number);
+ }
avio_seek(pb, file_size, SEEK_SET);
}
return 0;