[MPlayer-cvslog] r22170 - in trunk/libmpcodecs: vd_ffmpeg.c ve_lavc.c

[Guillaume Poirier]

Hi,

reimar wrote:
> Log:
> Fix compilation after deprecation of some lav log level and
> pixel format stuff.
> 
> 
> Modified: trunk/libmpcodecs/vd_ffmpeg.c
> ==============================================================================
> --- trunk/libmpcodecs/vd_ffmpeg.c	(original)
> +++ trunk/libmpcodecs/vd_ffmpeg.c	Wed Feb  7 10:58:23 2007
> @@ -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 @@

This doesn't seem to work here:

make -C libmpcodecs
cc -I.. -Inative -I../libmpdemux -I../stream -I../loader
-I../libavutil -I../libavcodec -I. -I.. -Wdeclaration-after-statement
-O4 -mcpu=970 -mtune=970 -pipe -ffast-math -fomit-frame-pointer
-faltivec -D__APPLE_ALTIVEC__ -mdynamic-no-pic -falign-loops=16
-DSYS_DARWIN -DCONFIG_DARWIN -shared-libgcc -DCONFIG_DARWIN
-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
-I/Users/guillaumepoirier/Prgm/x264_noops/ -I/usr/local/include
-I/usr/X11R6/include -I/opt/local/include/SDL  -D_THREAD_SAFE
-I/opt/local/include/freetype2 -I/opt/local/include   -c -o
vd_ffmpeg.o vd_ffmpeg.c
vd_ffmpeg.c: In function 'init':
vd_ffmpeg.c:234: error: invalid lvalue in assignment
vd_ffmpeg.c:390: warning: 'AVPaletteControl' is deprecated
vd_ffmpeg.c: In function 'get_buffer':
vd_ffmpeg.c:620: warning: assignment from incompatible pointer type
vd_ffmpeg.c: In function 'decode':
vd_ffmpeg.c:752: warning: assignment from incompatible pointer type
vd_ffmpeg.c:776: warning: comparison of distinct pointer types lacks a
cast
vd_ffmpeg.c:903: warning: pointer targets in assignment differ in
signedness
make[1]: *** [vd_ffmpeg.o] Error 1
make: *** [libmpcodecs/libmpcodecs.a] Error 2

Guillaume