ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sat Mar 21 00:24:31 2015 +0100| [3c5c6870a7ffa4997928caddb0802c7a1e5fcfeb] | committer: Michael Niedermayer
avformat/movenc: avoid using uninitialized display_matrix_size Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3c5c6870a7ffa4997928caddb0802c7a1e5fcfeb --- libavformat/movenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 7f684b8..a9e1a23 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2302,7 +2302,7 @@ static int mov_write_tkhd_tag(AVIOContext *pb, MOVMuxContext *mov, display_matrix = (uint32_t*)av_stream_get_side_data(st, AV_PKT_DATA_DISPLAYMATRIX, &display_matrix_size); - if (display_matrix_size < 9 * sizeof(*display_matrix)) + if (display_matrix && display_matrix_size < 9 * sizeof(*display_matrix)) display_matrix = NULL; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
