[MPlayer-dev-eng] [PATCH] include libavutil to fix building with zr

[Corey Hickey]

Diego Biurrun wrote:
> On Wed, Aug 31, 2005 at 01:43:13AM -0700, Corey Hickey wrote:
> 
>>It seems the recent libavutil formation broke compilation with
>>--enable-zr. I copied a few lines from libaf/Makefile into
>>libvo/Makefile and that seems to do the trick.
> 
> 
> Can you please show me the error message?

Sure:
=========================================================================
ccache gcc-3.4 -c -I../libvo -I../../libvo -I/usr/X11R6/include -O4
-pipe -ffast-math -fomit-frame-pointer -D
_REENTRANT -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64  -I. -I..
-I../osdep -I/usr/include/freetype2 -I/usr/incl
ude/SDL -D_REENTRANT -I/usr/X11R6/include    -DMPG12PLAY  -o vo_zr.o vo_zr.c
vo_zr.c: In function `zoran_getcap':
vo_zr.c:131: warning: assignment discards qualifiers from pointer target
type
ccache gcc-3.4 -c -I../libvo -I../../libvo -I/usr/X11R6/include -O4
-pipe -ffast-math -fomit-frame-pointer -D
_REENTRANT -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64  -I. -I..
-I../osdep -I/usr/include/freetype2 -I/usr/incl
ude/SDL -D_REENTRANT -I/usr/X11R6/include    -DMPG12PLAY  -o jpeg_enc.o
jpeg_enc.c
In file included from jpeg_enc.c:38:
../libavcodec/avcodec.h:14:20: avutil.h: No such file or directory
In file included from jpeg_enc.c:38:
../libavcodec/avcodec.h:660: error: parse error before "uint8_t"
../libavcodec/avcodec.h:660: warning: no semicolon at end of struct or union
../libavcodec/avcodec.h:660: error: parse error before '*' token
../libavcodec/avcodec.h:660: warning: data definition has no type or
storage class
../libavcodec/avcodec.h:660: error: parse error before '*' token
../libavcodec/avcodec.h:660: warning: data definition has no type or
storage class
../libavcodec/avcodec.h:660: error: parse error before '*' token
======================================================================
...after that it's just a bunch more parse errors from avcodec.h.

> BTW, vo_zr2.c seems to contradict the man page regarding the way you
> have to specify the suboptions.  Could you please clarify this?

I can agree with you but I cannot really clarify. I don't have any
zr-supported hardware. The only reason I noticed this bug is because
every once in a while I make a build of mplayer with everything I can
possibly enable.

Probably the man page should be updated to match the usage printout in
vo_zr2.c. I looked at it loosely and the option parsing seems to match.
Here's a snippet (whitespace adjusted):
======================================================================
if (subopt_parse(arg, subopts)) {
  mp_msg(MSGT_VO, MSGL_FATAL,
    "Allowed suboptions for -vo zr2 are:\n"
     "-  dev=DEVICE               (default: %s)\n"
     "-  norm=PAL|NTSC|SECAM|auto (default: auto)\n"
     "-  prebuf/noprebuf          (default:"
     " noprebuf)\n"
     "\n"
     "Example: mplayer -vo zr2:dev=/dev/video1:"
     "norm=PAL movie.avi\n\n"
     , guess_device(NULL, 0));
   free(norm_arg);
   free(dev_arg);
   return -1;
}
=======================================================================

-Corey