diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-29 03:20:29 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-29 03:20:29 +0400 |
| commit | 4dcd1a3145dd93602b86a44ebc07d98ca2a30ab6 (patch) | |
| tree | 694f5d2cba955bc53de20f8fb81cb54439ae5279 /libavcodec/txd.c | |
| parent | 4b03d960220d15cb915c2c8f15970d2f36f25cd9 (diff) | |
| parent | ac47e014bbaf5163871a8beb7522015e0bc27615 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
adtsenc: Check frame size.
txd: Fix order of operations.
APIchanges: fill in some blanks
timer: fix misspelling of "decicycles"
Eliminate pointless 0/NULL initializers in AVCodec and similar declarations.
indeo3: cosmetics
md5proto: Fix order of operations.
dca: Replace oversized unused get_bits() with skip_bits_long().
Conflicts:
doc/APIchanges
libavformat/mmsh.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/txd.c')
| -rw-r--r-- | libavcodec/txd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/txd.c b/libavcodec/txd.c index 1b9755cc19..ca07b6ce17 100644 --- a/libavcodec/txd.c +++ b/libavcodec/txd.c @@ -116,7 +116,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: if (buf_end - cur < (w/4) * (h/4) * 8) return AVERROR_INVALIDDATA; |