[FFmpeg-cvslog] txd: Fix order of operations.

Alex Converse git at videolan.org
Tue Nov 29 00:37:13 CET 2011


ffmpeg | branch: master | Alex Converse <alex.converse at gmail.com> | Sun Nov 27 16:17:13 2011 -0800| [a27805189ba505834c74ec72edc5fddf18f5cfa9] | committer: Alex Converse

txd: Fix order of operations.

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

 libavcodec/txd.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/libavcodec/txd.c b/libavcodec/txd.c
index 74ffff6..734062a 100644
--- a/libavcodec/txd.c
+++ b/libavcodec/txd.c
@@ -108,7 +108,8 @@ static int txd_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
     } else if (depth == 16) {
         switch (d3d_format) {
         case 0:
-            if (!flags&1) goto unsupported;
+            if (!(flags & 1))
+                goto unsupported;
         case FF_S3TC_DXT1:
             ff_decode_dxt1(cur, ptr, w, h, stride);
             break;



More information about the ffmpeg-cvslog mailing list