diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-31 20:35:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-31 21:35:40 +0200 |
| commit | dfb4757bbe110650b903bc763f8f61c930fa70a2 (patch) | |
| tree | e743474882803df222cac65dad8d45f813ddf3af | |
| parent | 42e78552c8a7d977c9573e6b1d5744ed65b6fc3f (diff) | |
| download | ffmpeg-dfb4757bbe110650b903bc763f8f61c930fa70a2.tar.gz | |
lavc: support building with the forks ABI for avcodec_find_best_pix_fmt2()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/avcodec.h | 7 | ||||
| -rw-r--r-- | libavcodec/imgconvert.c | 8 |
2 files changed, 15 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index dc58c8c605..199dd3ba5f 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -4597,8 +4597,15 @@ enum PixelFormat avcodec_find_best_pix_fmt_of_2(enum PixelFormat dst_pix_fmt1, e enum PixelFormat src_pix_fmt, int has_alpha, int *loss_ptr); attribute_deprecated +#if AV_HAVE_INCOMPATIBLE_FORK_ABI +enum PixelFormat avcodec_find_best_pix_fmt2(enum PixelFormat *pix_fmt_list, + enum PixelFormat src_pix_fmt, + int has_alpha, int *loss_ptr); +#else 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); +#endif + enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum PixelFormat * fmt); diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index cbd46cdc18..82da64b775 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -577,11 +577,19 @@ enum PixelFormat avcodec_find_best_pix_fmt_of_2(enum PixelFormat dst_pix_fmt1, e return dst_pix_fmt; } +#if AV_HAVE_INCOMPATIBLE_FORK_ABI +enum PixelFormat avcodec_find_best_pix_fmt2(enum PixelFormat *pix_fmt_list, + enum PixelFormat src_pix_fmt, + int has_alpha, int *loss_ptr){ + return avcodec_find_best_pix_fmt_of_list(pix_fmt_list, src_pix_fmt, has_alpha, loss_ptr); +} +#else 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) { return avcodec_find_best_pix_fmt_of_2(dst_pix_fmt1, dst_pix_fmt2, src_pix_fmt, has_alpha, loss_ptr); } +#endif enum PixelFormat avcodec_find_best_pix_fmt_of_list(enum PixelFormat *pix_fmt_list, enum PixelFormat src_pix_fmt, |