RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-18 13:14:36 +00:00
Code Issues Releases Wiki Activity

Fix compilation after deprecation of some lav log level and

Browse Source 
pixel format stuff.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22170 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2007-02-07 09:58:23 +00:00
parent 860dd21ab1
commit 8ff440d6a4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libmpcodecs/vd_ffmpeg.c
View File

@ -231,7 +231,7 @@ static int init(sh_video_t *sh){
avcodec_init();
avcodec_register_all();
avcodec_inited=1;
av_log_set_callback(mp_msp_av_log_callback);
av_vlog = mp_msp_av_log_callback;
}
ctx = sh->context = malloc(sizeof(vd_ffmpeg_ctx));
@ -302,7 +302,7 @@ static int init(sh_video_t *sh){
avctx->error_concealment= lavc_param_error_concealment;
avctx->debug= lavc_param_debug;
if (lavc_param_debug)
av_log_set_level(AV_LOG_DEBUG);
av_log_level = AV_LOG_DEBUG;
avctx->debug_mv= lavc_param_vismv;
avctx->skip_top = lavc_param_skip_top;
avctx->skip_bottom= lavc_param_skip_bottom;
@ -524,9 +524,9 @@ static int init_vo(sh_video_t *sh, enum PixelFormat pix_fmt){
case PIX_FMT_YUVJ444P:
case PIX_FMT_YUV444P: ctx->best_csp=IMGFMT_444P;break; //photo jpeg
case PIX_FMT_YUV411P: ctx->best_csp=IMGFMT_411P;break; //dv ntsc
case PIX_FMT_YUV422: ctx->best_csp=IMGFMT_YUY2;break; //huffyuv perhaps in the future
case PIX_FMT_YUYV422: ctx->best_csp=IMGFMT_YUY2;break; //huffyuv perhaps in the future
case PIX_FMT_RGB24 : ctx->best_csp=IMGFMT_RGB24;break; //qtrle
case PIX_FMT_RGBA32: ctx->best_csp=IMGFMT_BGR32;break; //huffyuv / mjpeg
case PIX_FMT_RGB32: ctx->best_csp=IMGFMT_BGR32;break; //huffyuv / mjpeg
case PIX_FMT_BGR24 : ctx->best_csp=IMGFMT_BGR24;break; //8bps
case PIX_FMT_RGB555: ctx->best_csp=IMGFMT_BGR15;break; //rpza,cram
case PIX_FMT_RGB565: ctx->best_csp=IMGFMT_BGR16;break; //4xm

2
libmpcodecs/ve_lavc.c
View File

@ -581,7 +581,7 @@ static int config(struct vf_instance_s* vf,
lavc_venc_context->pix_fmt = PIX_FMT_YUV410P;
break;
case IMGFMT_BGR32:
lavc_venc_context->pix_fmt = PIX_FMT_RGBA32;
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));