summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authorlorenm <lorenm@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-01-05 11:03:54 +0000
committerlorenm <lorenm@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-01-05 11:03:54 +0000
commitffc9727f997381946102e7c3d3c7b08c1901ffd2 (patch)
tree17d97d4593410cd7200650d0137109301d4936fe /libmpcodecs
parent995e7b9e1c07778c93faa6d5f087e94f07d8bf82 (diff)
downloadmpv-ffc9727f997381946102e7c3d3c7b08c1901ffd2.tar.bz2
mpv-ffc9727f997381946102e7c3d3c7b08c1901ffd2.tar.xz
remove code for colorspaces x264 doesn't support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25598 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/ve_x264.c27
1 files changed, 1 insertions, 26 deletions
diff --git a/libmpcodecs/ve_x264.c b/libmpcodecs/ve_x264.c
index a53948ccac..7a96b5de0c 100644
--- a/libmpcodecs/ve_x264.c
+++ b/libmpcodecs/ve_x264.c
@@ -156,6 +156,7 @@ static int config(struct vf_instance_s* vf, int width, int height, int d_width,
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* vf, int width, int height, int d_width,
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");