aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/aes.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-01-14 02:22:09 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-01-14 02:22:09 +0100
commite986a5d10d95b62cd85aaefc7d4da34699fbedeb (patch)
tree38dddca2b4582111bcf1bcb6be2d1c6193300f2d /libavutil/aes.c
parent36397ea1c7e27ab850149cc61394c2baa26dd532 (diff)
parent68d6012c723bb520daac5336dcb046c0a5dd3826 (diff)
downloadffmpeg-e986a5d10d95b62cd85aaefc7d4da34699fbedeb.tar.gz
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>
Diffstat (limited to 'libavutil/aes.c')
0 files changed, 0 insertions, 0 deletions