[FFmpeg-cvslog] ffplay: fix null pointer read when codec unavilable.
Michael Niedermayer
git at videolan.org
Sat May 7 20:00:02 CEST 2011
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat May 7 16:54:06 2011 +0200| [99119bdffe17ac8919f0f97ace61251ad4bc6a2a] | committer: Michael Niedermayer
ffplay: fix null pointer read when codec unavilable.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=99119bdffe17ac8919f0f97ace61251ad4bc6a2a
---
ffplay.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ffplay.c b/ffplay.c
index d76ea5b..60b6207 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -2191,6 +2191,9 @@ static int stream_component_open(VideoState *is, int stream_index)
}
codec = avcodec_find_decoder(avctx->codec_id);
+ if (!codec)
+ return -1;
+
avctx->debug_mv = debug_mv;
avctx->debug = debug;
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)
avctx->flags |= CODEC_FLAG_EMU_EDGE;
- if (!codec ||
- avcodec_open(avctx, codec) < 0)
+ if (avcodec_open(avctx, codec) < 0)
return -1;
/* prepare audio output */
More information about the ffmpeg-cvslog
mailing list