diff options
Diffstat (limited to 'libmpcodecs/ve_vfw.c')
-rw-r--r-- | libmpcodecs/ve_vfw.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/libmpcodecs/ve_vfw.c b/libmpcodecs/ve_vfw.c index 3ca53734c6..40a6d6ea0b 100644 --- a/libmpcodecs/ve_vfw.c +++ b/libmpcodecs/ve_vfw.c @@ -26,7 +26,6 @@ #include "config.h" #include "mp_msg.h" -#include "help_mp.h" #include "codec-cfg.h" //#include "stream/stream.h" @@ -101,16 +100,16 @@ static BITMAPINFOHEADER* vfw_open_encoder(char *dll_name, char *compdatafile, BI ret = ICGetInfo(encoder_hic, &icinfo, sizeof(ICINFO)); mp_msg(MSGT_WIN32,MSGL_INFO,"%ld - %ld - %d\n", ret, icinfo.dwSize, sizeof(ICINFO)); - mp_msg(MSGT_WIN32,MSGL_INFO,MSGTR_MPCODECS_CompressorType, icinfo.fccType); - mp_msg(MSGT_WIN32,MSGL_INFO,MSGTR_MPCODECS_CompressorSubtype, icinfo.fccHandler); - mp_msg(MSGT_WIN32,MSGL_INFO,MSGTR_MPCODECS_CompressorFlags, + mp_tmsg(MSGT_WIN32,MSGL_INFO,"Compressor type: %.4lx\n", icinfo.fccType); + mp_tmsg(MSGT_WIN32,MSGL_INFO,"Compressor subtype: %.4lx\n", icinfo.fccHandler); + mp_tmsg(MSGT_WIN32,MSGL_INFO,"Compressor flags: %lu, version %lu, ICM version: %lu\n", icinfo.dwFlags, icinfo.dwVersion, icinfo.dwVersionICM); //printf("Compressor name: %s\n", icinfo.szName); //printf("Compressor description: %s\n", icinfo.szDescription); -mp_msg(MSGT_WIN32,MSGL_INFO,MSGTR_MPCODECS_Flags); +mp_tmsg(MSGT_WIN32,MSGL_INFO,"Flags:"); if (icinfo.dwFlags & VIDCF_QUALITY) - mp_msg(MSGT_WIN32,MSGL_INFO,MSGTR_MPCODECS_Quality); + mp_tmsg(MSGT_WIN32,MSGL_INFO," quality"); if (icinfo.dwFlags & VIDCF_FASTTEMPORALD) mp_msg(MSGT_WIN32,MSGL_INFO," fast-decompr"); if (icinfo.dwFlags & VIDCF_QUALITYTIME) @@ -275,7 +274,7 @@ static int vfw_encode_frame(BITMAPINFOHEADER* biOutput,void* OutBuf, #define mux_v (vf->priv->mux) #define vfw_bih (vf->priv->bih) -static int config(struct vf_instance *vf, +static int config(struct vf_instance* vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ @@ -293,17 +292,17 @@ static int config(struct vf_instance *vf, return 1; } -static int control(struct vf_instance *vf, int request, void* data){ +static int control(struct vf_instance* vf, int request, void* data){ return CONTROL_UNKNOWN; } -static int query_format(struct vf_instance *vf, unsigned int fmt){ +static int query_format(struct vf_instance* vf, unsigned int fmt){ if(fmt==IMGFMT_BGR24) return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_FLIPPED; return 0; } -static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts){ long flags=0; int ret; // flip_upside_down(vo_image_ptr,vo_image_ptr,3*vo_w,vo_h); // dirty hack @@ -314,7 +313,7 @@ static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ return 1; } -static void uninit(struct vf_instance *vf) +static void uninit(struct vf_instance* vf) { HRESULT ret; @@ -356,7 +355,7 @@ static int vf_open(vf_instance_t *vf, char* args){ if (!vfw_param_codec) { - mp_msg(MSGT_WIN32,MSGL_WARN, MSGTR_MPCODECS_NoVfwCodecSpecified); + mp_tmsg(MSGT_WIN32,MSGL_WARN, "[VE_RAW] Required VfW codec not specified!!\n"); return 0; } // mux_v->bih=vfw_open_encoder("divxc32.dll",vfw_bih,mmioFOURCC('D', 'I', 'V', '3')); |