# HG changeset patch
# User bellard
# Date 1042243626 0
# Node ID 001b7d3045e53901203c6abea7c18a4faa987a34
# Parent  295ec9bebf932db3596082a1f00b3fc5887d2832
moved avcodec_get_chroma_sub_sample() to imgconvert.c

diff -r 295ec9bebf93 -r 001b7d3045e5 utils.c
--- a/utils.c	Sat Jan 11 00:04:36 2003 +0000
+++ b/utils.c	Sat Jan 11 00:07:06 2003 +0000
@@ -89,32 +89,6 @@
     format->next = NULL;
 }
 
-void avcodec_get_chroma_sub_sample(int fmt, int *h_shift, int *v_shift){
-    switch(fmt){
-    case PIX_FMT_YUV410P:
-        *h_shift=2;
-        *v_shift=2;
-        break;
-    case PIX_FMT_YUV420P:
-        *h_shift=1;
-        *v_shift=1;
-        break;
-    case PIX_FMT_YUV411P:
-        *h_shift=2;
-        *v_shift=0;
-        break;
-    case PIX_FMT_YUV422P:
-    case PIX_FMT_YUV422:
-        *h_shift=1;
-        *v_shift=0;
-        break;
-    default: //RGB/...
-        *h_shift=0;
-        *v_shift=0;
-        break;
-    }
-}
-
 typedef struct DefaultPicOpaque{
     int last_pic_num;
     uint8_t *data[4];
@@ -152,7 +126,6 @@
         case PIX_FMT_BGR24:
             pixel_size=3;
             break;
-        case PIX_FMT_BGRA32:
         case PIX_FMT_RGBA32:
             pixel_size=4;
             break;
@@ -462,7 +435,7 @@
         if (enc->codec_id == CODEC_ID_RAWVIDEO) {
             snprintf(buf + strlen(buf), buf_size - strlen(buf),
                      ", %s",
-                     pix_fmt_str[enc->pix_fmt]);
+                     avcodec_get_pix_fmt_name(enc->pix_fmt));
         }
         if (enc->width) {
             snprintf(buf + strlen(buf), buf_size - strlen(buf),
@@ -577,7 +550,6 @@
         picture->linesize[0] = width * 3;
         break;
     case PIX_FMT_RGBA32:
-    case PIX_FMT_BGRA32:
         picture->data[0] = ptr;
         picture->data[1] = NULL;
         picture->data[2] = NULL;
@@ -617,7 +589,6 @@
         size = (size * 3);
         break;
     case PIX_FMT_RGBA32:
-    case PIX_FMT_BGRA32:
         size = (size * 4);
         break;
     case PIX_FMT_YUV422: