summaryrefslogtreecommitdiffstats
path: root/libavcodec/motionpixels.c
diff options
context:
space:
mode:
authorLaurent Aimar <fenrir@videolan.org>2011-09-10 13:28:13 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-09-10 15:38:59 +0200
commit824f98f442996eaee9204b132752cf5114fc94cf (patch)
tree920d94fe9754d2e7cfb2942e4f7554663d8d390d /libavcodec/motionpixels.c
parentb10ba1175d3afa28d88cf3b24b69dc4882be16f5 (diff)
downloadffmpeg-streaming-824f98f442996eaee9204b132752cf5114fc94cf.zip
ffmpeg-streaming-824f98f442996eaee9204b132752cf5114fc94cf.tar.gz
Fixed deference of NULL pointer in motionpixels decoder.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/motionpixels.c')
-rw-r--r--libavcodec/motionpixels.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/motionpixels.c b/libavcodec/motionpixels.c
index a3868e1..1605080 100644
--- a/libavcodec/motionpixels.c
+++ b/libavcodec/motionpixels.c
@@ -279,7 +279,8 @@ static int mp_decode_frame(AVCodecContext *avctx,
if (sz == 0)
goto end;
- init_vlc(&mp->vlc, mp->max_codes_bits, mp->codes_count, &mp->codes[0].size, sizeof(HuffCode), 1, &mp->codes[0].code, sizeof(HuffCode), 4, 0);
+ if (init_vlc(&mp->vlc, mp->max_codes_bits, mp->codes_count, &mp->codes[0].size, sizeof(HuffCode), 1, &mp->codes[0].code, sizeof(HuffCode), 4, 0))
+ goto end;
mp_decode_frame_helper(mp, &gb);
free_vlc(&mp->vlc);
OpenPOWER on IntegriCloud