diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-02-07 09:58:23 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-02-07 09:58:23 +0000 |
| commit | 8ff440d6a4395a2a848e9299964cc275563f0815 (patch) | |
| tree | 23bbc1092724898b6b54b4f697a4847b1be5ec0e /libmpcodecs | |
| parent | 860dd21ab109d185632aa164389d0964f5bf9e3a (diff) | |
| download | mpv-8ff440d6a4395a2a848e9299964cc275563f0815.tar.bz2 mpv-8ff440d6a4395a2a848e9299964cc275563f0815.tar.xz | |
Fix compilation after deprecation of some lav log level and
pixel format stuff.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22170 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 8 | ||||
| -rw-r--r-- | libmpcodecs/ve_lavc.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 1e710d54f0..d2d10eff3c 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -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 diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c index 16e95ec69f..fc59a94a6c 100644 --- a/libmpcodecs/ve_lavc.c +++ b/libmpcodecs/ve_lavc.c @@ -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)); |