Mercurial > mplayer.hg
changeset 22152:1f6c89bc1c3a
Fix compilation after deprecation of some lav log level and
pixel format stuff.
| author | reimar |
|---|---|
| date | Wed, 07 Feb 2007 09:58:23 +0000 |
| parents | db9f2e48c710 |
| children | 0cf24df5d97b |
| files | libmpcodecs/vd_ffmpeg.c libmpcodecs/ve_lavc.c |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpcodecs/vd_ffmpeg.c Wed Feb 07 09:00:11 2007 +0000 +++ b/libmpcodecs/vd_ffmpeg.c Wed Feb 07 09:58:23 2007 +0000 @@ -231,7 +231,7 @@ 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 @@ 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 @@ 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
--- a/libmpcodecs/ve_lavc.c Wed Feb 07 09:00:11 2007 +0000 +++ b/libmpcodecs/ve_lavc.c Wed Feb 07 09:58:23 2007 +0000 @@ -581,7 +581,7 @@ 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));