[MPlayer-cvslog] r25598 - trunk/libmpcodecs/ve_x264.c

lorenm subversion at mplayerhq.hu
Sat Jan 5 12:03:54 CET 2008


Author: lorenm
Date: Sat Jan  5 12:03:54 2008
New Revision: 25598

Log:
remove code for colorspaces x264 doesn't support


Modified:
   trunk/libmpcodecs/ve_x264.c

Modified: trunk/libmpcodecs/ve_x264.c
==============================================================================
--- trunk/libmpcodecs/ve_x264.c	(original)
+++ trunk/libmpcodecs/ve_x264.c	Sat Jan  5 12:03:54 2008
@@ -156,6 +156,7 @@ static int config(struct vf_instance_s* 
 
     mod->mux->bih->biWidth = width;
     mod->mux->bih->biHeight = height;
+    mod->mux->bih->biSizeImage = width * height * 3;
     mod->mux->aspect = (float)d_width/d_height;
     
     // make sure param is initialized
@@ -172,35 +173,9 @@ static int config(struct vf_instance_s* 
     switch(outfmt) {
     case IMGFMT_I420:
         param.i_csp = X264_CSP_I420;
-        mod->mux->bih->biSizeImage = width * height * 3;
         break;
     case IMGFMT_YV12:
         param.i_csp = X264_CSP_YV12;
-        mod->mux->bih->biSizeImage = width * height * 3;
-        break;
-    case IMGFMT_422P:
-        param.i_csp = X264_CSP_I422;
-        mod->mux->bih->biSizeImage = width * height * 3;
-        break;
-    case IMGFMT_444P:
-        param.i_csp = X264_CSP_I444;
-        mod->mux->bih->biSizeImage = width * height * 3;
-        break;
-    case IMGFMT_YVYU:
-        param.i_csp = X264_CSP_YUYV;
-        mod->mux->bih->biSizeImage = width * height * 3;
-        break;
-    case IMGFMT_RGB:
-        param.i_csp = X264_CSP_RGB;
-        mod->mux->bih->biSizeImage = width * height * 3;
-        break;
-    case IMGFMT_BGR:
-        param.i_csp = X264_CSP_BGR;
-        mod->mux->bih->biSizeImage = width * height * 3;
-        break;
-    case IMGFMT_BGR32:
-        param.i_csp = X264_CSP_BGRA;
-        mod->mux->bih->biSizeImage = width * height * 4;
         break;
     default:
         mp_msg(MSGT_MENCODER, MSGL_ERR, "Wrong colorspace.\n");



More information about the MPlayer-cvslog mailing list