1 --- gpac/modules/ffmpeg_in/ffmpeg_in.h.orig 2008-10-20 13:04:40.000000000 +0200
2 +++ gpac/modules/ffmpeg_in/ffmpeg_in.h 2011-03-28 19:44:02.765729730 +0200
6 /*include FFMPEG APIs*/
7 -#include <ffmpeg/avformat.h>
8 +#include <libavformat/avformat.h>
10 void gf_av_vlog(void* avcl, int level, const char *fmt, va_list vl);
13 #if LIBAVCODEC_VERSION_INT > ((52<<16)+(0<<8)+0)
14 #define FFMPEG_SWSCALE
15 -#include <ffmpeg/swscale.h>
16 +#include <libswscale/swscale.h>
19 /*FFMPEG decoder module */
20 --- gpac/configure.orig 2011-03-27 21:38:49.493737273 +0200
21 +++ gpac/configure 2011-03-28 19:44:22.401729730 +0200
22 @@ -732,7 +732,7 @@ fi
23 #look for FFMPEG support
26 -#include <ffmpeg/avcodec.h>
27 +#include <libavcodec/avcodec.h>
28 int main( void ) { return 0; }
31 --- gpac/modules/ffmpeg_in/ffmpeg_decode.c.orig 2008-11-28 18:26:06.000000000 +0100
32 +++ gpac/modules/ffmpeg_in/ffmpeg_decode.c 2011-03-28 20:33:19.441729730 +0200
35 /*setup audio streams*/
36 if (ffd->st==GF_STREAM_AUDIO) {
37 - if ((ffd->codec->type == CODEC_ID_MP3LAME) || (ffd->codec->type == CODEC_ID_MP2)) {
38 + if ((ffd->codec->type == CODEC_ID_MP3) || (ffd->codec->type == CODEC_ID_MP2)) {
39 ffd->ctx->frame_size = (ffd->ctx->sample_rate > 24000) ? 1152 : 576;
41 /*may be 0 (cfg not known yet)*/
46 - sws_scale(ffd->sws_ctx, ffd->frame->data, ffd->frame->linesize, 0, ffd->ctx->height->codec->height, pict.data, pict.linesize);
47 + sws_scale(ffd->sws_ctx, ffd->frame->data, ffd->frame->linesize, 0, ffd->ctx->height, pict.data, pict.linesize);