ercpe 14/07/09 07:40:33 Added: jubler-4.6.1-ffmpeg-2.patch Log: Added #ifndef for deprecated AVCODEC_MAX_AUDIO_FRAME_SIZE to make it compile with ffmpeg > 2.something (bug #515480) (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 77C501ED)
Revision Changes Path 1.1 media-video/jubler/files/jubler-4.6.1-ffmpeg-2.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/jubler/files/jubler-4.6.1-ffmpeg-2.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/jubler/files/jubler-4.6.1-ffmpeg-2.patch?rev=1.1&content-type=text/plain Index: jubler-4.6.1-ffmpeg-2.patch =================================================================== diff --git a/Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeaudio.c b/Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeaudio.c index 92bf071..d163010 100644 --- a/Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeaudio.c +++ b/Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeaudio.c @@ -37,6 +37,13 @@ jboolean decodeAudio(JNIEnv* env, jobject this, const char *input_filename, cons AVStream *add_audio_stream(JNIEnv* env, jobject this, AVFormatContext *oc, int codec_id, int sample_rate, int channels); void audio_enc_out(JNIEnv * env, jobject this, AVFormatContext *ofcx, AVStream *audio_st, const short *samples, int buf_size); +#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE +#ifndef MAX_AUDIO_FRAME_SIZE +#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio +#else +#define AVCODEC_MAX_AUDIO_FRAME_SIZE MAX_AUDIO_FRAME_SIZE +#endif +#endif JNIEXPORT jboolean JNICALL Java_com_panayotis_jubler_media_preview_decoders_FFMPEG_createClip(JNIEnv * env, jobject this, jstring audio, jstring wav, jlong start, jlong stop) { const char * audio_c; diff --git a/Jubler-4.6.1/resources/ffmpeg/ffdecode/makecache.c b/Jubler-4.6.1/resources/ffmpeg/ffdecode/makecache.c index d7ea88b..0190b79 100644 --- a/Jubler-4.6.1/resources/ffmpeg/ffdecode/makecache.c +++ b/Jubler-4.6.1/resources/ffmpeg/ffdecode/makecache.c @@ -38,6 +38,14 @@ #include "defaults.h" #include "utilities.h" +#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE +#ifndef MAX_AUDIO_FRAME_SIZE +#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio +#else +#define AVCODEC_MAX_AUDIO_FRAME_SIZE MAX_AUDIO_FRAME_SIZE +#endif +#endif + JNIEXPORT jboolean JNICALL Java_com_panayotis_jubler_media_preview_decoders_NativeDecoder_makeCache(JNIEnv * env, jobject this, jstring audio, jstring cache, jstring original) { const char *audio_c; const char *cache_c;
