virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

ffplay: fix null pointer read when codec unavilable.

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-05-07 16:54:06 +02:00
parent 6fd00e9dd9
commit 99119bdffe
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ffplay.c
View File

@ -2191,6 +2191,9 @@ static int stream_component_open(VideoState *is, int stream_index)
} }
codec = avcodec_find_decoder(avctx->codec_id); codec = avcodec_find_decoder(avctx->codec_id);
if (!codec)
return -1;
avctx->debug_mv = debug_mv; avctx->debug_mv = debug_mv;
avctx->debug = debug; avctx->debug = debug;
avctx->workaround_bugs = workaround_bugs; avctx->workaround_bugs = workaround_bugs;
@ -2210,8 +2213,7 @@ static int stream_component_open(VideoState *is, int stream_index)
if(codec->capabilities & CODEC_CAP_DR1) if(codec->capabilities & CODEC_CAP_DR1)
avctx->flags |= CODEC_FLAG_EMU_EDGE; avctx->flags |= CODEC_FLAG_EMU_EDGE;
if (!codec || if (avcodec_open(avctx, codec) < 0)
avcodec_open(avctx, codec) < 0)
return -1; return -1;
/* prepare audio output */ /* prepare audio output */