From 9d21494776dc5cb4fedd3cce71d2d4de2593b09e Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Mon, 8 Sep 2008 18:29:08 +0000
Subject: [PATCH] avcodec_find_best_pix_fmt() needs a 64bit mask as there are
more than 32 pix_fmts.
Originally committed as revision 15271 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/avcodec.h | 2 +-
libavcodec/imgconvert.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index c7e1b648bfd..ec8228fee4d 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2444,7 +2444,7 @@ int avcodec_get_pix_fmt_loss(int dst_pix_fmt, int src_pix_fmt,
* @param[out] loss_ptr Combination of flags informing you what kind of losses will occur.
* @return The best pixel format to convert to or -1 if none was found.
*/
-int avcodec_find_best_pix_fmt(int pix_fmt_mask, int src_pix_fmt,
+int avcodec_find_best_pix_fmt(int64_t pix_fmt_mask, int src_pix_fmt,
int has_alpha, int *loss_ptr);
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index d182c5905d7..fcdfbd973b1 100644
--- a/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c
@@ -772,7 +772,7 @@ static int avg_bits_per_pixel(int pix_fmt)
return bits;
}
-static int avcodec_find_best_pix_fmt1(int pix_fmt_mask,
+static int avcodec_find_best_pix_fmt1(int64_t pix_fmt_mask,
int src_pix_fmt,
int has_alpha,
int loss_mask)
@@ -797,7 +797,7 @@ static int avcodec_find_best_pix_fmt1(int pix_fmt_mask,
return dst_pix_fmt;
}
-int avcodec_find_best_pix_fmt(int pix_fmt_mask, int src_pix_fmt,
+int avcodec_find_best_pix_fmt(int64_t pix_fmt_mask, int src_pix_fmt,
int has_alpha, int *loss_ptr)
{
int dst_pix_fmt, loss_mask, i;
--
GitLab