diff options
| author | trav90 <travawine@openmailbox.org> | 2018-02-04 13:19:22 -0600 |
|---|---|---|
| committer | trav90 <travawine@openmailbox.org> | 2018-02-04 13:19:22 -0600 |
| commit | 30bfbb3f97bd64b7838bcb55c98fa698b1bcc9d2 (patch) | |
| tree | a6031d45b30f0b5b66e2b1774d75b0f953a2aedc /media/ffvpx/libavcodec/imgconvert.c | |
| parent | fc7d9fade54dfbe275c4808dabe30a19415082e0 (diff) | |
| download | UXP-30bfbb3f97bd64b7838bcb55c98fa698b1bcc9d2.tar UXP-30bfbb3f97bd64b7838bcb55c98fa698b1bcc9d2.tar.gz UXP-30bfbb3f97bd64b7838bcb55c98fa698b1bcc9d2.tar.lz UXP-30bfbb3f97bd64b7838bcb55c98fa698b1bcc9d2.tar.xz UXP-30bfbb3f97bd64b7838bcb55c98fa698b1bcc9d2.zip | |
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, |