[FFmpeg-cvslog] tiff: Fix assignments in if()

Michael Niedermayer git at videolan.org
Sun Jan 20 23:13:05 CET 2013


ffmpeg | branch: release/1.0 | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 14 00:06:44 2013 +0100| [ee8d38191fbfdc90ebd0c95f8793cc4cb11c1558] | committer: Michael Niedermayer

tiff: Fix assignments in if()

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 659546b42d6550e67fcdbb4937cd1982c60448aa)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/tiff.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index e8f2a8d..5be154f 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -843,7 +843,7 @@ static int tiff_decode_tag(TiffContext *s)
             s->fax_opts = value;
         break;
 #define ADD_METADATA(count, name, sep)\
-    if (ret = add_metadata(count, type, name, sep, s) < 0) {\
+    if ((ret = add_metadata(count, type, name, sep, s)) < 0) {\
         av_log(s->avctx, AV_LOG_ERROR, "Error allocating temporary buffer\n");\
         return ret;\
     }



More information about the ffmpeg-cvslog mailing list