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
17 years ago · 9d21494776
parent 047599a4ba
commit 9d21494776
2 changed files with 3 additions and 3 deletions
--- 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);


--- 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;