Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-03-21 02:24:31 +0300
committerMichael Niedermayer <michaelni@gmx.at>2015-03-21 02:24:31 +0300
commit3c5c6870a7ffa4997928caddb0802c7a1e5fcfeb (patch)
treed82ad0db639130dee52f4c4db576e2b4e450a301 /libavformat
parent276a8666d2d990335314752f8f8bdfdaac69e410 (diff)
avformat/movenc: avoid using uninitialized display_matrix_size
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/movenc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 7f684b820e..a9e1a23f4c 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;
}