ffmpeg | branch: master | Martin Storsjö <mar...@martin.st> | Mon Nov 3 20:13:36 2014 +0200| [9a5ac36b69ede4563e9ecd734141b12ea3280fbc] | committer: Martin Storsjö
movenc: Require samples before trying to write edts This avoids a potential crash if writing a fragmented psp mp4 (which probably is only a hypothetical scenario). Signed-off-by: Martin Storsjö <mar...@martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9a5ac36b69ede4563e9ecd734141b12ea3280fbc --- libavformat/movenc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index bb1dc8a..fa5fdad 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1771,9 +1771,9 @@ static int mov_write_trak_tag(AVIOContext *pb, MOVMuxContext *mov, avio_wb32(pb, 0); /* size */ ffio_wfourcc(pb, "trak"); mov_write_tkhd_tag(pb, mov, track, st); - if (track->mode == MODE_PSP || track->flags & MOV_TRACK_CTTS || - (track->entry && track->cluster[0].dts) || - is_clcp_track(track)) { + if (track->entry && + (track->mode == MODE_PSP || track->flags & MOV_TRACK_CTTS || + track->cluster[0].dts || is_clcp_track(track))) { if (mov->use_editlist) mov_write_edts_tag(pb, mov, track); // PSP Movies require edts box else if ((track->entry && track->cluster[0].dts) || track->mode == MODE_PSP || is_clcp_track(track)) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog