From d5f550e257fb7c22bd4e72a852919b1ceacca196 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 6 Sep 2008 18:16:39 +0000 Subject: Remove outdated URL from vd_info_t struct. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27533 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/vd_ffmpeg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libmpcodecs/vd_ffmpeg.c') diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index e082d2a5a0..f50c5c69b6 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -19,7 +19,7 @@ static vd_info_t info = { "ffmpeg", "A'rpi", "A'rpi, Michael, Alex", - "native codecs (http://ffmpeg.sf.net/)" + "native codecs" }; LIBVD_EXTERN(ffmpeg) -- cgit v1.2.3 From 923f67082e60afc96d9efd2b88f75d992834c8a6 Mon Sep 17 00:00:00 2001 From: uau Date: Mon, 8 Sep 2008 17:02:32 +0000 Subject: Fix compilation after libavcodec major version 52 changes Some symbols were dropped or renamed, requiring corresponding changes in MPlayer. - Use AVCodecContext->bits_per_coded_sample instead of ->bits_per_sample. - Use AVCodecContext->trellis instead of ->flags&CODEC_FLAG_TRELLIS_QUANT. - Don't set AVCodecContext->rtp_mode (already marked unused before). - Use ff_eval2() instead of ff_eval(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27548 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/vd_ffmpeg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libmpcodecs/vd_ffmpeg.c') diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index f50c5c69b6..da1350eee0 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -401,7 +401,7 @@ static int init(sh_video_t *sh){ } if(sh->bih) - avctx->bits_per_sample= sh->bih->biBitCount; + avctx->bits_per_coded_sample= sh->bih->biBitCount; if(lavc_param_threads > 1) avcodec_thread_init(avctx, lavc_param_threads); -- cgit v1.2.3 From 2bfa73021412ba6e96f628f24d00877d6f0aaeb9 Mon Sep 17 00:00:00 2001 From: gpoirier Date: Mon, 8 Sep 2008 20:01:10 +0000 Subject: fix compilation with lavc version > r15270 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27549 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/vd_ffmpeg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libmpcodecs/vd_ffmpeg.c') diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index da1350eee0..1a25a84959 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -283,7 +283,7 @@ static int init(sh_video_t *sh){ avctx->width = sh->disp_w; avctx->height= sh->disp_h; avctx->workaround_bugs= lavc_param_workaround_bugs; - avctx->error_resilience= lavc_param_error_resilience; + avctx->error_recognition= lavc_param_error_resilience; if(lavc_param_gray) avctx->flags|= CODEC_FLAG_GRAY; #ifdef CODEC_FLAG2_FAST avctx->flags2|= lavc_param_fast; -- cgit v1.2.3