[FFmpeg-cvslog] r15271 - in trunk/libavcodec: avcodec.h imgconvert.c

[michael]

Author: michael
Date: Mon Sep  8 20:29:08 2008
New Revision: 15271

Log:
avcodec_find_best_pix_fmt() needs a 64bit mask as there are more than 32 pix_fmts.


Modified:
   trunk/libavcodec/avcodec.h
   trunk/libavcodec/imgconvert.c

Modified: trunk/libavcodec/avcodec.h
==============================================================================
--- trunk/libavcodec/avcodec.h	(original)
+++ trunk/libavcodec/avcodec.h	Mon Sep  8 20:29:08 2008
@@ -2444,7 +2444,7 @@ int avcodec_get_pix_fmt_loss(int dst_pix
  * @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);
 
 

Modified: trunk/libavcodec/imgconvert.c
==============================================================================
--- trunk/libavcodec/imgconvert.c	(original)
+++ trunk/libavcodec/imgconvert.c	Mon Sep  8 20:29:08 2008
@@ -772,7 +772,7 @@ static int avg_bits_per_pixel(int pix_fm
     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(in
     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;