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:55 +0200
commit2cf6afffe54f32ea76aabe758049b574b5a30dfd (patch)
tree6843ae96f210079dc60ce8efc400954b8eea40a2
parent50e6e494c90ece9b66a8f6ecac342acd410a2ff0 (diff)
downloadffmpeg-2cf6afffe54f32ea76aabe758049b574b5a30dfd.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 af812d09eb..0ad7b3342c 100644
--- a/libavformat/swfenc.c
+++ b/libavformat/swfenc.c
@@ -498,8 +498,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;