Changeset 1bdc212 in ffmpeg

Timestamp:

Dec 18, 2011, 2:04:44 AM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

38331d20

Parents:

1a2484fc (diff), 0ea5b442 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (12/18/11 01:23:57)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (12/18/11 02:04:44)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: build: link test programs with static libraries dct-test: remove unused variable cropTbl swscale: fix overflow in gray16 vertical scaling. get_bits: remove LAST_SKIP_CACHE macro swscale: fix integer overflows in RGB pixel writing. swscale: add endian conversion for RGB555 and RGB444 pixel formats swscale: fix overflows in output of RGB48 pixels. get_bits: remove strange/obsolete comments get_bits: whitespace (mostly) cosmetics swscale: add rgb565 endianess conversion get_bits: remove unnecessary #includes mp3dec: hack: fix decoding with safe bitstream reader fate: fix eatqi test adpcm: Check for channels to be a non-zero integer swscale: fix overflows in RGB rounding constants. get_bits: introduce safe bitreading to prevent overreads.

Conflicts:

libswscale/swscale.c
libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)