[FFmpeg-cvslog] ffplay: only initialize codec opts before using it

Marton Balint git at videolan.org
Thu Nov 1 22:15:39 CET 2012


ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Sun Oct 28 02:19:18 2012 +0200| [fdb933444add87e026b64639d0db83b0d5177c7b] | committer: Marton Balint

ffplay: only initialize codec opts before using it

Fixes Coverity CID 733793.

Signed-off-by: Marton Balint <cus at passwd.hu>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fdb933444add87e026b64639d0db83b0d5177c7b
---

 ffplay.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ffplay.c b/ffplay.c
index 2339192..beced86 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -2277,7 +2277,6 @@ static int stream_component_open(VideoState *is, int stream_index)
     avctx = ic->streams[stream_index]->codec;
 
     codec = avcodec_find_decoder(avctx->codec_id);
-    opts = filter_codec_opts(codec_opts, avctx->codec_id, ic, ic->streams[stream_index], codec);
 
     switch(avctx->codec_type){
         case AVMEDIA_TYPE_AUDIO   : is->last_audio_stream    = stream_index; if(audio_codec_name   ) codec= avcodec_find_decoder_by_name(   audio_codec_name); break;
@@ -2305,6 +2304,7 @@ static int stream_component_open(VideoState *is, int stream_index)
     if(codec->capabilities & CODEC_CAP_DR1)
         avctx->flags |= CODEC_FLAG_EMU_EDGE;
 
+    opts = filter_codec_opts(codec_opts, avctx->codec_id, ic, ic->streams[stream_index], codec);
     if (!av_dict_get(opts, "threads", NULL, 0))
         av_dict_set(&opts, "threads", "auto", 0);
     if (!codec ||



More information about the ffmpeg-cvslog mailing list