diff -Naupr ffmpeg-20080510.orig/configure ffmpeg-20080510/configure --- ffmpeg-20080510.orig/configure 2008-05-11 15:08:18.000000000 +0200 +++ ffmpeg-20080510/configure 2008-05-11 19:49:21.000000000 +0200 @@ -1640,7 +1640,7 @@ enabled libdirac && add_cflags "$(pkg- && require libdirac libdirac_decoder/dirac_parser.h dirac_decoder_init -ldirac_decoder \ && require libdirac libdirac_encoder/dirac_encoder.h dirac_encoder_init -ldirac_encoder enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac -enabled libfaad && require2 libfaad faad.h faacDecOpen -lfaad +enabled libfaad && require2 libfaad faad.h NeAACDecOpen -lfaad enabled libgsm && require libgsm gsm.h gsm_create -lgsm enabled libmp3lame && require LAME lame/lame.h lame_init -lmp3lame -lm enabled libnut && require libnut libnut.h nut_demuxer_init -lnut diff -Naupr ffmpeg-20080510.orig/libavcodec/libfaad.c ffmpeg-20080510/libavcodec/libfaad.c --- ffmpeg-20080510.orig/libavcodec/libfaad.c 2008-03-21 04:11:20.000000000 +0100 +++ ffmpeg-20080510/libavcodec/libfaad.c 2008-05-11 19:49:40.000000000 +0200 @@ -55,42 +55,42 @@ typedef struct { int init; /* faad calls */ - faacDecHandle FAADAPI (*faacDecOpen)(void); - faacDecConfigurationPtr FAADAPI (*faacDecGetCurrentConfiguration)(faacDecHandle hDecoder); + NeAACDecHandle FAADAPI (*NeAACDecOpen)(void); + NeAACDecConfigurationPtr FAADAPI (*NeAACDecGetCurrentConfiguration)(NeAACDecHandle hDecoder); #ifndef FAAD2_VERSION - int FAADAPI (*faacDecSetConfiguration)(faacDecHandle hDecoder, - faacDecConfigurationPtr config); - int FAADAPI (*faacDecInit)(faacDecHandle hDecoder, + int FAADAPI (*NeAACDecSetConfiguration)(NeAACDecHandle hDecoder, + NeAACDecConfigurationPtr config); + int FAADAPI (*NeAACDecInit)(NeAACDecHandle hDecoder, unsigned char *buffer, unsigned long *samplerate, unsigned long *channels); - int FAADAPI (*faacDecInit2)(faacDecHandle hDecoder, unsigned char *pBuffer, + int FAADAPI (*NeAACDecInit2)(NeAACDecHandle hDecoder, unsigned char *pBuffer, unsigned long SizeOfDecoderSpecificInfo, unsigned long *samplerate, unsigned long *channels); - int FAADAPI (*faacDecDecode)(faacDecHandle hDecoder, + int FAADAPI (*NeAACDecDecode)(NeAACDecHandle hDecoder, unsigned char *buffer, unsigned long *bytesconsumed, short *sample_buffer, unsigned long *samples); #else - unsigned char FAADAPI (*faacDecSetConfiguration)(faacDecHandle hDecoder, - faacDecConfigurationPtr config); - long FAADAPI (*faacDecInit)(faacDecHandle hDecoder, + unsigned char FAADAPI (*NeAACDecSetConfiguration)(NeAACDecHandle hDecoder, + NeAACDecConfigurationPtr config); + long FAADAPI (*NeAACDecInit)(NeAACDecHandle hDecoder, unsigned char *buffer, unsigned long buffer_size, unsigned long *samplerate, unsigned char *channels); - char FAADAPI (*faacDecInit2)(faacDecHandle hDecoder, unsigned char *pBuffer, + char FAADAPI (*NeAACDecInit2)(NeAACDecHandle hDecoder, unsigned char *pBuffer, unsigned long SizeOfDecoderSpecificInfo, unsigned long *samplerate, unsigned char *channels); - void *FAADAPI (*faacDecDecode)(faacDecHandle hDecoder, - faacDecFrameInfo *hInfo, + void *FAADAPI (*NeAACDecDecode)(NeAACDecHandle hDecoder, + NeAACDecFrameInfo *hInfo, unsigned char *buffer, unsigned long buffer_size); - char* FAADAPI (*faacDecGetErrorMessage)(unsigned char errcode); + char* FAADAPI (*NeAACDecGetErrorMessage)(unsigned char errcode); #endif - void FAADAPI (*faacDecClose)(faacDecHandle hDecoder); + void FAADAPI (*NeAACDecClose)(NeAACDecHandle hDecoder); } FAACContext; @@ -107,11 +107,11 @@ static void channel_setup(AVCodecContext FAACContext *s = avctx->priv_data; if (avctx->request_channels > 0 && avctx->request_channels == 2 && avctx->request_channels < avctx->channels) { - faacDecConfigurationPtr faac_cfg; + NeAACDecConfigurationPtr faac_cfg; avctx->channels = 2; - faac_cfg = s->faacDecGetCurrentConfiguration(s->faac_handle); + faac_cfg = s->NeAACDecGetCurrentConfiguration(s->faac_handle); faac_cfg->downMatrix = 1; - s->faacDecSetConfiguration(s->faac_handle, faac_cfg); + s->NeAACDecSetConfiguration(s->faac_handle, faac_cfg); } #endif } @@ -128,12 +128,12 @@ static int faac_init_mp4(AVCodecContext int r = 0; if (avctx->extradata){ - r = s->faacDecInit2(s->faac_handle, (uint8_t*) avctx->extradata, + r = s->NeAACDecInit2(s->faac_handle, (uint8_t*) avctx->extradata, avctx->extradata_size, &samplerate, &channels); if (r < 0){ av_log(avctx, AV_LOG_ERROR, - "faacDecInit2 failed r:%d sr:%ld ch:%ld s:%d\n", + "NeAACDecInit2 failed r:%d sr:%ld ch:%ld s:%d\n", r, samplerate, (long)channels, avctx->extradata_size); } else { avctx->sample_rate = samplerate; @@ -157,13 +157,13 @@ static int faac_decode_frame(AVCodecCont unsigned long samples; int out; #else - faacDecFrameInfo frame_info; + NeAACDecFrameInfo frame_info; void *out; #endif if(buf_size == 0) return 0; #ifndef FAAD2_VERSION - out = s->faacDecDecode(s->faac_handle, + out = s->NeAACDecDecode(s->faac_handle, (unsigned char*)buf, &bytesconsumed, data, @@ -178,10 +178,10 @@ static int faac_decode_frame(AVCodecCont if(!s->init){ unsigned long srate; unsigned char channels; - int r = s->faacDecInit(s->faac_handle, buf, buf_size, &srate, &channels); + int r = s->NeAACDecInit(s->faac_handle, buf, buf_size, &srate, &channels); if(r < 0){ av_log(avctx, AV_LOG_ERROR, "faac: codec init failed: %s\n", - s->faacDecGetErrorMessage(frame_info.error)); + s->NeAACDecGetErrorMessage(frame_info.error)); return -1; } avctx->sample_rate = srate; @@ -190,11 +190,11 @@ static int faac_decode_frame(AVCodecCont s->init = 1; } - out = s->faacDecDecode(s->faac_handle, &frame_info, (unsigned char*)buf, (unsigned long)buf_size); + out = s->NeAACDecDecode(s->faac_handle, &frame_info, (unsigned char*)buf, (unsigned long)buf_size); if (frame_info.error > 0) { av_log(avctx, AV_LOG_ERROR, "faac: frame decoding failed: %s\n", - s->faacDecGetErrorMessage(frame_info.error)); + s->NeAACDecGetErrorMessage(frame_info.error)); return -1; } @@ -213,7 +213,7 @@ static av_cold int faac_decode_end(AVCod { FAACContext *s = avctx->priv_data; - s->faacDecClose(s->faac_handle); + s->NeAACDecClose(s->faac_handle); dlclose(s->handle); return 0; @@ -222,7 +222,7 @@ static av_cold int faac_decode_end(AVCod static av_cold int faac_decode_init(AVCodecContext *avctx) { FAACContext *s = avctx->priv_data; - faacDecConfigurationPtr faac_cfg; + NeAACDecConfigurationPtr faac_cfg; #ifdef CONFIG_LIBFAADBIN const char* err = 0; @@ -236,13 +236,13 @@ static av_cold int faac_decode_init(AVCo } #define dfaac(a) do { \ - const char* n = AV_STRINGIFY(faacDec ## a); \ - if (!err && !(s->faacDec ## a = dlsym(s->handle, n))) { \ + const char* n = AV_STRINGIFY(NeAACDec ## a); \ + if (!err && !(s->NeAACDec ## a = dlsym(s->handle, n))) { \ err = n; \ } \ } while(0) #else /* !CONFIG_LIBFAADBIN */ -#define dfaac(a) s->faacDec ## a = faacDec ## a +#define dfaac(a) s->NeAACDec ## a = NeAACDec ## a #endif /* CONFIG_LIBFAADBIN */ // resolve all needed function calls @@ -268,7 +268,7 @@ static av_cold int faac_decode_init(AVCo } #endif - s->faac_handle = s->faacDecOpen(); + s->faac_handle = s->NeAACDecOpen(); if (!s->faac_handle) { av_log(avctx, AV_LOG_ERROR, "FAAD library: cannot create handler!\n"); faac_decode_end(avctx); @@ -276,7 +276,7 @@ static av_cold int faac_decode_init(AVCo } - faac_cfg = s->faacDecGetCurrentConfiguration(s->faac_handle); + faac_cfg = s->NeAACDecGetCurrentConfiguration(s->faac_handle); if (faac_cfg) { switch (avctx->bits_per_sample) { @@ -306,7 +306,7 @@ static av_cold int faac_decode_init(AVCo faac_cfg->defObjectType = LC; } - s->faacDecSetConfiguration(s->faac_handle, faac_cfg); + s->NeAACDecSetConfiguration(s->faac_handle, faac_cfg); faac_init_mp4(avctx);