From ecbed31c0029ffec61e325a0136efaba1198f97d Mon Sep 17 00:00:00 2001
From: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Date: Mon, 1 Feb 2010 22:23:17 +0000
Subject: [PATCH] =?UTF-8?q?Use=20parentheses=20around=20&&=20within=20||,?=
=?UTF-8?q?=20fix=20the=20gcc=20warning:=20ffplay.c:=20In=20function=20?=
=?UTF-8?q?=E2=80=98video=5Fthread=E2=80=99:=20ffplay.c:1391:=20warning:?=
=?UTF-8?q?=20suggest=20parentheses=20around=20&&=20within=20||?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Originally committed as revision 21600 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
ffplay.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ffplay.c b/ffplay.c
index f5286a492f9..33f91d39057 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -1387,7 +1387,7 @@ static int video_thread(void *arg)
}
if( ( decoder_reorder_pts==1
- || decoder_reorder_pts && is->faulty_pts<is->faulty_dts
+ || (decoder_reorder_pts && is->faulty_pts<is->faulty_dts)
|| pkt->dts == AV_NOPTS_VALUE)
&& frame->reordered_opaque != AV_NOPTS_VALUE)
pts= frame->reordered_opaque;
--
GitLab