[FFmpeg-cvslog] Fix muxing mjpeg in swf.

Carl Eugen Hoyos git at videolan.org
Thu Sep 13 09:40:09 CEST 2012


ffmpeg | branch: release/0.5 | Carl Eugen Hoyos <cehoyos at ag.or.at> | Thu Sep 13 09:26:55 2012 +0200| [09a278fdd13cfc16c151190051f362625595c06e] | committer: Carl Eugen Hoyos

Fix muxing mjpeg in swf.
(cherry picked from commit 79234907128390d775ceb1206dd0fed111a17896)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=09a278fdd13cfc16c151190051f362625595c06e
---

 libavformat/swfenc.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/swfenc.c b/libavformat/swfenc.c
index b433f6b..c1bb2b7 100644
--- a/libavformat/swfenc.c
+++ b/libavformat/swfenc.c
@@ -496,8 +496,10 @@ static int swf_write_trailer(AVFormatContext *s)
         put_le32(pb, file_size);
         url_fseek(pb, swf->duration_pos, SEEK_SET);
         put_le16(pb, swf->video_frame_number);
+        if (swf->vframes_pos) {
         url_fseek(pb, swf->vframes_pos, SEEK_SET);
         put_le16(pb, swf->video_frame_number);
+        }
         url_fseek(pb, file_size, SEEK_SET);
     }
     return 0;



More information about the ffmpeg-cvslog mailing list