multimedia/mpeg4ip compile breaks

[Bruce M Simpson]

this is with ffmpeg-devel-2007.03.31_1 installed automatically by 
portupgrade.

The following two patches seem to be needed.

In file included from ffmpeg.h:30,
                 from ffmpeg.cpp:26:
/usr/local/include/ffmpeg/avcodec.h:2450: warning: `ImgReSampleContext' 
is deprecated (declared at /usr/local/include/ffmpeg/avcodec.h:2447)
/usr/local/include/ffmpeg/avcodec.h:2457: warning: `ImgReSampleContext' 
is deprecated (declared at /usr/local/include/ffmpeg/avcodec.h:2447)
/usr/local/include/ffmpeg/avcodec.h:2461: warning: `ImgReSampleContext' 
is deprecated (declared at /usr/local/include/ffmpeg/avcodec.h:2447)
/usr/local/include/ffmpeg/avcodec.h:2463: warning: `ImgReSampleContext' 
is deprecated (declared at /usr/local/include/ffmpeg/avcodec.h:2447)
ffmpeg.cpp: In function `codec_data_t* ffmpeg_create(const char*, const 
char*, int, int, format_list_t*, audio_info_t*, const uint8_t*, 
uint32_t, audio_vft_t*, void*)':
ffmpeg.cpp:169: error: invalid conversion from `void*' to `uint8_t*'
ffmpeg.cpp: In function `int ffmpeg_decode(codec_data_t*, 
frame_timestamp_t*, int, int*, uint8_t*, uint32_t, void*)':
ffmpeg.cpp:217: warning: `avcodec_decode_audio' is deprecated (declared 
at /usr/local/include/ffmpeg/avcodec.h:2743)
ffmpeg.cpp:218: warning: `avcodec_decode_audio' is deprecated (declared 
at /usr/local/include/ffmpeg/avcodec.h:2743)
gmake[5]: *** [ffmpeg.lo] Error 1
gmake[5]: Leaving directory 
`/usr/ports/multimedia/mpeg4ip/work/mpeg4ip-1.5.0.1/player/plugin/audio/ffmpeg'
gmake[4]: *** [all-recursive] Error 1
gmake[4]: Leaving directory 
`/usr/ports/multimedia/mpeg4ip/work/mpeg4ip-1.5.0.1/player/plugin/audio'
gmake[3]: *** [all-recursive] Error 1
gmake[3]: Leaving directory 
`/usr/ports/multimedia/mpeg4ip/work/mpeg4ip-1.5.0.1/player/plugin'
gmake[2]: *** [all-recursive] Error 1
gmake[2]: Leaving directory 
`/usr/ports/multimedia/mpeg4ip/work/mpeg4ip-1.5.0.1/player'
gmake[1]: *** [all-recursive] Error 1
gmake[1]: Leaving directory 
`/usr/ports/multimedia/mpeg4ip/work/mpeg4ip-1.5.0.1'
gmake: *** [all] Error 2
*** Error code 2

Stop in /usr/ports/multimedia/mpeg4ip.
*** Error code 1

Stop in /usr/ports/multimedia/mpeg4ip.
empiric#

-------------- next part --------------
--- mpeg4ip-1.5.0.1/player/plugin/audio/ffmpeg/ffmpeg.cpp.orig	Sun Apr  8 16:21:30 2007
+++ mpeg4ip-1.5.0.1/player/plugin/audio/ffmpeg/ffmpeg.cpp	Sun Apr  8 16:22:05 2007
@@ -166,7 +166,7 @@
     break;
   }
   if (userdata) {
-    ffmpeg->m_c->extradata = (void *)userdata;
+    ffmpeg->m_c->extradata = (uint8_t *)userdata;
     ffmpeg->m_c->extradata_size = ud_size;
   }
   if (avcodec_open(ffmpeg->m_c, ffmpeg->m_codec) < 0) {
-------------- next part --------------
--- mpeg4ip-1.5.0.1/player/plugin/video/ffmpeg/ffmpeg.cpp.orig	Sun Apr  8 16:22:49 2007
+++ mpeg4ip-1.5.0.1/player/plugin/video/ffmpeg/ffmpeg.cpp	Sun Apr  8 16:23:20 2007
@@ -255,7 +255,7 @@
   }
     break;
   case CODEC_ID_SVQ3:
-    ffmpeg->m_c->extradata = (void *)userdata;
+    ffmpeg->m_c->extradata = (uint8_t *)userdata;
     ffmpeg->m_c->extradata_size = ud_size;
     if (vinfo != NULL) {
       ffmpeg->m_c->width = vinfo->width;