Changeset e986a5d1 in ffmpeg
- Timestamp:
-
Jan 14, 2012, 1:22:09 AM
(13 years ago)
- Author:
- Michael Niedermayer <michaelni@gmx.at>
- Branches:
- master
- Children:
- c834c7e3
- Parents:
- 36397ea1 (diff), 68d6012c (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.
- Message:
-
Merge remote-tracking branch 'qatar/master'
- qatar/master:
FATE: add tests for targa
ARM: fix Thumb-mode simple_idct_arm
ARM: 4-byte align start of all asm functions
rgb2rgb: rgb12to15()
swscale-test: fix stack overread.
swscale: fix invalid conversions and memory problems.
cabac: split cabac.h into declarations and function definitions
cabac: Mark ff_h264_mps_state array as static, it is only used within cabac.c.
cabac: Remove ff_h264_lps_state array.
Conflicts:
libswscale/rgb2rgb.h
libswscale/swscale_unscaled.c
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-
(No files)
-
