Reuse the fmt-conversion code instead of duplicating the functionality.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30354 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2010-01-17 14:58:44 +00:00
parent 89d8ae77a8
commit ed03545c3c
1 changed files with 4 additions and 24 deletions

View File

@ -24,6 +24,7 @@
#include "libmpdemux/muxer.h" #include "libmpdemux/muxer.h"
#include "img_format.h" #include "img_format.h"
#include "fmt-conversion.h"
#include "mp_image.h" #include "mp_image.h"
#include "vf.h" #include "vf.h"
@ -593,30 +594,9 @@ static int config(struct vf_instance_s* vf,
} }
mux_v->imgfmt = lavc_param_format; mux_v->imgfmt = lavc_param_format;
switch(lavc_param_format) lavc_venc_context->pix_fmt = imgfmt2pixfmt(lavc_param_format);
{ if (lavc_venc_context->pix_fmt == PIX_FMT_NONE)
case IMGFMT_YV12: return 0;
lavc_venc_context->pix_fmt = PIX_FMT_YUV420P;
break;
case IMGFMT_422P:
lavc_venc_context->pix_fmt = PIX_FMT_YUV422P;
break;
case IMGFMT_444P:
lavc_venc_context->pix_fmt = PIX_FMT_YUV444P;
break;
case IMGFMT_411P:
lavc_venc_context->pix_fmt = PIX_FMT_YUV411P;
break;
case IMGFMT_YVU9:
lavc_venc_context->pix_fmt = PIX_FMT_YUV410P;
break;
case IMGFMT_BGR32:
lavc_venc_context->pix_fmt = PIX_FMT_RGB32;
break;
default:
mp_msg(MSGT_MENCODER,MSGL_ERR,"%s is not a supported format\n", vo_format_name(lavc_param_format));
return 0;
}
if(!stats_file) { if(!stats_file) {
/* lavc internal 2pass bitrate control */ /* lavc internal 2pass bitrate control */