summaryrefslogtreecommitdiff
path: root/libavcodec/imgconvert.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-09-08 18:29:08 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-09-08 18:29:08 +0000
commit9d21494776dc5cb4fedd3cce71d2d4de2593b09e (patch)
tree8356ddb8fd36d6c4cadac2d38af0cbed17d22ec6 /libavcodec/imgconvert.c
parent047599a4ba6352b2b5911c10fbec821ef6612d95 (diff)
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
Diffstat (limited to 'libavcodec/imgconvert.c')
-rw-r--r--libavcodec/imgconvert.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index d182c5905d..fcdfbd973b 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;