[FFmpeg-cvslog] r19933 - trunk/libavcodec/utils.c

diego subversion
Sun Sep 20 20:29:48 CEST 2009


Author: diego
Date: Sun Sep 20 20:29:48 2009
New Revision: 19933

Log:
Add parentheses to logical expression to avoid the warning:
libavcodec/utils.c:476: warning: suggest parentheses around && within ||

Modified:
   trunk/libavcodec/utils.c

Modified: trunk/libavcodec/utils.c
==============================================================================
--- trunk/libavcodec/utils.c	Sun Sep 20 20:21:54 2009	(r19932)
+++ trunk/libavcodec/utils.c	Sun Sep 20 20:29:48 2009	(r19933)
@@ -472,8 +472,9 @@ int attribute_align_arg avcodec_open(AVC
         avcodec_set_dimensions(avctx, avctx->width, avctx->height);
 
 #define SANE_NB_CHANNELS 128U
-    if((avctx->coded_width||avctx->coded_height) && avcodec_check_dimensions(avctx,avctx->coded_width,avctx->coded_height) ||
-        avctx->channels > SANE_NB_CHANNELS) {
+    if (((avctx->coded_width || avctx->coded_height)
+        && avcodec_check_dimensions(avctx, avctx->coded_width, avctx->coded_height))
+        || avctx->channels > SANE_NB_CHANNELS) {
         av_freep(&avctx->priv_data);
         ret = AVERROR(EINVAL);
         goto end;



More information about the ffmpeg-cvslog mailing list