diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-03 00:07:51 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-03 00:12:18 +0400 |
| commit | 1d186e9e120d777cc9f5e68d2974d48bfbdd528e (patch) | |
| tree | 571e05f6a9ba06c10729f67ccd29353c2b31aa19 /libavcodec/bink.c | |
| parent | 03cbe6c8bc42626107e75b001180b81781619ed7 (diff) | |
| parent | 62ee0e6a977e1990c9853630c7dea1415b38bb28 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Revert "swscale: use 15-bit intermediates for 9/10-bit scaling."
swscale: use 15-bit intermediates for 9/10-bit scaling.
dct32: Add SSE2 ASM optimizations
Correct chroma vector calculation for RealVideo 3.
lavf: Add an option to discard corrupted frames
mpegts: Mark wrongly-sized packets as corrupted
mpegts: Move scan test to handle_packets
mpegts: Mark corrupted packets
mpegts: Reset continuity counter on seek
mpegts: Fix for continuity counter
mpegts: Silence "can't seek" warning on unseekable
apichange: add an entry for AV_PKT_FLAG_CORRUPT
avpacket: signal possibly corrupted packets
mpeg4videodec: remove dead code that would have detected erroneous encoding
aac: Remove some suspicious illegal memcpy()s from LTP.
bink: Eliminate unnecessary shadow declaration.
Conflicts:
doc/APIchanges
libavcodec/version.h
libavformat/avformat.h
libavformat/options.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/bink.c')
| -rw-r--r-- | libavcodec/bink.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/bink.c b/libavcodec/bink.c index 6b58f7716b..e137312693 100644 --- a/libavcodec/bink.c +++ b/libavcodec/bink.c @@ -624,7 +624,6 @@ static int read_dct_coeffs(GetBitContext *gb, int32_t block[64], const uint8_t * coef_list[--list_start] = ccoef; mode_list[ list_start] = 3; } else { - int t; if (!bits) { t = 1 - (get_bits1(gb) << 1); } else { |