diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-02-06 12:03:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-06 12:03:37 +0100 |
| commit | 5cc30e0f603a030b97b7be37a7aa5d22d13f7a07 (patch) | |
| tree | 01875b465e2f7749cc8f87f1df756b2cb2ca2596 /media/ffvpx/libavcodec/imgconvert.c | |
| parent | 389c60da5e01761f4a11ef539ffa26e4c1b17875 (diff) | |
| parent | 30bfbb3f97bd64b7838bcb55c98fa698b1bcc9d2 (diff) | |
| download | UXP-5cc30e0f603a030b97b7be37a7aa5d22d13f7a07.tar UXP-5cc30e0f603a030b97b7be37a7aa5d22d13f7a07.tar.gz UXP-5cc30e0f603a030b97b7be37a7aa5d22d13f7a07.tar.lz UXP-5cc30e0f603a030b97b7be37a7aa5d22d13f7a07.tar.xz UXP-5cc30e0f603a030b97b7be37a7aa5d22d13f7a07.zip | |
Merge pull request #10 from trav90/media-work
Update FFmpeg code to n3.2-65-gee56777
Diffstat (limited to 'media/ffvpx/libavcodec/imgconvert.c')
| -rw-r--r-- | media/ffvpx/libavcodec/imgconvert.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/media/ffvpx/libavcodec/imgconvert.c b/media/ffvpx/libavcodec/imgconvert.c index 46fa7809b..1547f1896 100644 --- a/media/ffvpx/libavcodec/imgconvert.c +++ b/media/ffvpx/libavcodec/imgconvert.c @@ -57,19 +57,11 @@ enum AVPixelFormat avcodec_find_best_pix_fmt_of_2(enum AVPixelFormat dst_pix_fmt return av_find_best_pix_fmt_of_2(dst_pix_fmt1, dst_pix_fmt2, src_pix_fmt, has_alpha, loss_ptr); } -#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI -enum AVPixelFormat avcodec_find_best_pix_fmt2(const enum AVPixelFormat *pix_fmt_list, - enum AVPixelFormat 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 AVPixelFormat avcodec_find_best_pix_fmt2(enum AVPixelFormat dst_pix_fmt1, enum AVPixelFormat dst_pix_fmt2, enum AVPixelFormat 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 AVPixelFormat avcodec_find_best_pix_fmt_of_list(const enum AVPixelFormat *pix_fmt_list, enum AVPixelFormat src_pix_fmt, |