diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-28 10:09:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-28 10:12:13 +0100 |
| commit | 893063781926aa23a28226384a8c46eea4e1524a (patch) | |
| tree | 6e1c1f271b59a5879388a6d39fba3f7a74b3e0de /libavcodec/mmvideo.c | |
| parent | b96dddd3440374682b72a00bb6041563f0a8cc86 (diff) | |
| parent | fc06ee6ee377cc3b512dff8f02057e26311bc4da (diff) | |
| download | ffmpeg-893063781926aa23a28226384a8c46eea4e1524a.tar.gz | |
Merge commit 'fc06ee6ee377cc3b512dff8f02057e26311bc4da'
* commit 'fc06ee6ee377cc3b512dff8f02057e26311bc4da':
mmvideo: fix uninitialized variable use in mm_decode_intra
Conflicts:
libavcodec/mmvideo.c
See: c2e3b564b32d596f5a66d47409f9e07a067a3084
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mmvideo.c')
| -rw-r--r-- | libavcodec/mmvideo.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/mmvideo.c b/libavcodec/mmvideo.c index 800e65c64c..ea182a0107 100644 --- a/libavcodec/mmvideo.c +++ b/libavcodec/mmvideo.c @@ -129,7 +129,8 @@ static int mm_decode_intra(MmContext * s, int half_horiz, int half_vert) */ static int mm_decode_inter(MmContext * s, int half_horiz, int half_vert) { - int data_off = bytestream2_get_le16(&s->gb), y = 0; + int data_off = bytestream2_get_le16(&s->gb); + int y = 0; GetByteContext data_ptr; if (bytestream2_get_bytes_left(&s->gb) < data_off) |