diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-15 01:21:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-15 01:23:16 +0200 |
| commit | 39afcf1d7eba8f2f3d59c973aa57df714e679629 (patch) | |
| tree | b56a004e08c68a38cc15becdec66bf528bd26478 /libavutil/aes.c | |
| parent | 2c501ae82b847d89c93e8aa1f4506fb564c344a7 (diff) | |
| parent | 2d497c141d1fb6df290cdf45404b01ea1697d618 (diff) | |
| download | ffmpeg-39afcf1d7eba8f2f3d59c973aa57df714e679629.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
eval: add gt(), gte(), lt() and lte() fate tests
eval: fix swapping of lt() and lte()
imgconvert: deprecate avcodec_find_best_pix_fmt()
imgconvert: add avcodec_find_best_pix_fmt2()
imgconvert: avoid undefined left shift in avcodec_find_best_pix_fmt
Conflicts:
libavcodec/imgconvert.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/aes.c')
0 files changed, 0 insertions, 0 deletions