[FFmpeg-devel] [PATCH 8/8] ffplay: remove redundant !codec check

Marton Balint cus at passwd.hu
Sun Oct 28 02:46:10 CEST 2012


Signed-off-by: Marton Balint <cus at passwd.hu>
---
 ffplay.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ffplay.c b/ffplay.c
index beced86..e3b156a 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -2307,8 +2307,7 @@ static int stream_component_open(VideoState *is, int stream_index)
     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 ||
-        avcodec_open2(avctx, codec, &opts) < 0)
+    if (avcodec_open2(avctx, codec, &opts) < 0)
         return -1;
     if ((t = av_dict_get(opts, "", NULL, AV_DICT_IGNORE_SUFFIX))) {
         av_log(NULL, AV_LOG_ERROR, "Option %s not found.\n", t->key);
-- 
1.7.10.4



More information about the ffmpeg-devel mailing list