diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-15 03:21:05 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-15 03:23:16 +0400 |
| commit | 39afcf1d7eba8f2f3d59c973aa57df714e679629 (patch) | |
| tree | b56a004e08c68a38cc15becdec66bf528bd26478 /libavcodec/imgconvert.c | |
| parent | 2c501ae82b847d89c93e8aa1f4506fb564c344a7 (diff) | |
| parent | 2d497c141d1fb6df290cdf45404b01ea1697d618 (diff) | |
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 'libavcodec/imgconvert.c')
| -rw-r--r-- | libavcodec/imgconvert.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 584a3ef652..36b8f6482e 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -515,6 +515,7 @@ static int avg_bits_per_pixel(enum PixelFormat pix_fmt) info->padded_size : av_get_bits_per_pixel(desc); } +#if FF_API_FIND_BEST_PIX_FMT enum PixelFormat avcodec_find_best_pix_fmt(int64_t pix_fmt_mask, enum PixelFormat src_pix_fmt, int has_alpha, int *loss_ptr) { @@ -531,6 +532,7 @@ enum PixelFormat avcodec_find_best_pix_fmt(int64_t pix_fmt_mask, enum PixelForma } return dst_pix_fmt; } +#endif /* FF_API_FIND_BEST_PIX_FMT */ enum PixelFormat avcodec_find_best_pix_fmt2(enum PixelFormat dst_pix_fmt1, enum PixelFormat dst_pix_fmt2, enum PixelFormat src_pix_fmt, int has_alpha, int *loss_ptr) |