ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Jan 23 22:53:25 2015 +0100| [a915b1daee3ba99306d79100d5e973549b48a891] | committer: Michael Niedermayer
Merge commit '3a6dfec864d569c2d0a875e1a7466f51b00edb63' * commit '3a6dfec864d569c2d0a875e1a7466f51b00edb63': segment: Check av_get_frame_filename() return value Conflicts: libavformat/segment.c No changes as there was no unchecked av_get_frame_filename() in segment.c Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a915b1daee3ba99306d79100d5e973549b48a891 --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog