Merge svn changes up to r28310

The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.

1 files changed, 4 insertions, 4 deletions

diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c
index 17db42b5cc..0e8fd81f97 100644
--- a/libmpcodecs/vd_ffmpeg.c
+++ b/libmpcodecs/vd_ffmpeg.c
@@ -924,7 +924,7 @@ static int mc_get_buffer(AVCodecContext *avctx, AVFrame *pic){
     sh_video_t * sh = avctx->opaque;
     vd_ffmpeg_ctx *ctx = sh->context;
     mp_image_t* mpi=NULL;
-    xvmc_render_state_t * render;
+    struct xvmc_render_state * render;
     int flags= MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_PREFER_ALIGNED_STRIDE| 
                MP_IMGFLAG_DRAW_CALLBACK;
     
@@ -1003,7 +1003,7 @@ static int mc_get_buffer(AVCodecContext *avctx, AVFrame *pic){
 
     pic->type= FF_BUFFER_TYPE_USER;
 
-    render=(xvmc_render_state_t*)mpi->priv;//same as data[2]
+    render=(struct xvmc_render_state*)mpi->priv;//same as data[2]
     if( mp_msg_test(MSGT_DECVIDEO,MSGL_DBG5) )
         mp_msg(MSGT_DECVIDEO, MSGL_DBG5, "vd_ffmpeg::mc_get_buffer (render=%p)\n",render);
     assert(render != 0);
@@ -1017,7 +1017,7 @@ static void mc_release_buffer(AVCodecContext *avctx, AVFrame *pic){
     mp_image_t* mpi= pic->opaque;
     sh_video_t * sh = avctx->opaque;
     vd_ffmpeg_ctx *ctx = sh->context;
-    xvmc_render_state_t * render;
+    struct xvmc_render_state * render;
     int i;
 
 
@@ -1030,7 +1030,7 @@ static void mc_release_buffer(AVCodecContext *avctx, AVFrame *pic){
 
 //printf("R%X %X\n", pic->linesize[0], pic->data[0]);
 //mark the surface as not requared for prediction
-    render=(xvmc_render_state_t*)pic->data[2];//same as mpi->priv
+    render=(struct xvmc_render_state*)pic->data[2];//same as mpi->priv
     if( mp_msg_test(MSGT_DECVIDEO,MSGL_DBG5) )
         mp_msg(MSGT_DECVIDEO, MSGL_DBG5, "vd_ffmpeg::mc_release_buffer (render=%p)\n",render);
     assert(render!=NULL);