generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add parentheses to logical expression to avoid the warning:

Browse Source 
libavcodec/utils.c:476: warning: suggest parentheses around && within ||

Originally committed as revision 19933 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun
2009-09-20 18:29:48 +00:00
parent a79b4b75f7
commit 40461e54ce
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/utils.c
View File

@@ -472,8 +472,9 @@ int attribute_align_arg avcodec_open(AVCodecContext *avctx, AVCodec *codec)
avcodec_set_dimensions(avctx, avctx->width, avctx->height); avcodec_set_dimensions(avctx, avctx->width, avctx->height);
#define SANE_NB_CHANNELS 128U #define SANE_NB_CHANNELS 128U
if((avctx->coded_width||avctx->coded_height) && avcodec_check_dimensions(avctx,avctx->coded_width,avctx->coded_height) || if (((avctx->coded_width || avctx->coded_height)
avctx->channels > SANE_NB_CHANNELS) { && avcodec_check_dimensions(avctx, avctx->coded_width, avctx->coded_height))
|| avctx->channels > SANE_NB_CHANNELS) {
av_freep(&avctx->priv_data); av_freep(&avctx->priv_data);
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto end; goto end;