mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-13 21:28:01 +02:00
39afcf1d7e
* 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>