[FFmpeg-cvslog] Removes the internal avcodec_find_best_pix_fmt1() function previously used by avcodec_find_best_pix_fmt() and not used anymore.

Matthew Einhorn git at videolan.org
Sat Aug 27 05:10:19 CEST 2011


ffmpeg | branch: master | Matthew Einhorn <moiein2000 at gmail.com> | Fri Aug 26 21:49:29 2011 -0400| [1d6eca2d27a7e106a3acd01c89e7de58400c4c61] | committer: Michael Niedermayer

Removes the internal avcodec_find_best_pix_fmt1()function previously used by avcodec_find_best_pix_fmt() and not used anymore.

Signed-off-by: Matthew Einhorn <moiein2000 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1d6eca2d27a7e106a3acd01c89e7de58400c4c61
---

 libavcodec/imgconvert.c |   26 --------------------------
 1 files changed, 0 insertions(+), 26 deletions(-)

diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index c0ad9ea..66ce9de 100644
--- a/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c
@@ -431,32 +431,6 @@ static int avg_bits_per_pixel(enum PixelFormat pix_fmt)
         info->padded_size : av_get_bits_per_pixel(desc);
 }
 
-static enum PixelFormat avcodec_find_best_pix_fmt1(int64_t pix_fmt_mask,
-                                      enum PixelFormat src_pix_fmt,
-                                      int has_alpha,
-                                      int loss_mask)
-{
-    int dist, i, loss, min_dist;
-    enum PixelFormat dst_pix_fmt;
-
-    /* find exact color match with smallest size */
-    dst_pix_fmt = PIX_FMT_NONE;
-    min_dist = 0x7fffffff;
-    for (i = 0; i < FFMIN(PIX_FMT_NB, 64); i++) {
-        if (pix_fmt_mask & (1ULL << i)) {
-            loss = avcodec_get_pix_fmt_loss(i, src_pix_fmt, has_alpha) & loss_mask;
-            if (loss == 0) {
-                dist = avg_bits_per_pixel(i);
-                if (dist < min_dist) {
-                    min_dist = dist;
-                    dst_pix_fmt = i;
-                }
-            }
-        }
-    }
-    return dst_pix_fmt;
-}
-
 enum PixelFormat avcodec_find_best_pix_fmt(int64_t pix_fmt_mask, enum PixelFormat src_pix_fmt,
                                             int has_alpha, int *loss_ptr)
 {



More information about the ffmpeg-cvslog mailing list