| 1 |
ercpe 14/07/09 07:40:33 |
| 2 |
|
| 3 |
Added: jubler-4.6.1-ffmpeg-2.patch |
| 4 |
Log: |
| 5 |
Added #ifndef for deprecated AVCODEC_MAX_AUDIO_FRAME_SIZE to make it compile with ffmpeg > 2.something (bug #515480) |
| 6 |
|
| 7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 77C501ED) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-video/jubler/files/jubler-4.6.1-ffmpeg-2.patch |
| 11 |
|
| 12 |
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 |
| 13 |
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 |
| 14 |
|
| 15 |
Index: jubler-4.6.1-ffmpeg-2.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeaudio.c b/Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeaudio.c |
| 18 |
index 92bf071..d163010 100644 |
| 19 |
--- a/Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeaudio.c |
| 20 |
+++ b/Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeaudio.c |
| 21 |
@@ -37,6 +37,13 @@ jboolean decodeAudio(JNIEnv* env, jobject this, const char *input_filename, cons |
| 22 |
AVStream *add_audio_stream(JNIEnv* env, jobject this, AVFormatContext *oc, int codec_id, int sample_rate, int channels); |
| 23 |
void audio_enc_out(JNIEnv * env, jobject this, AVFormatContext *ofcx, AVStream *audio_st, const short *samples, int buf_size); |
| 24 |
|
| 25 |
+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE |
| 26 |
+#ifndef MAX_AUDIO_FRAME_SIZE |
| 27 |
+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio |
| 28 |
+#else |
| 29 |
+#define AVCODEC_MAX_AUDIO_FRAME_SIZE MAX_AUDIO_FRAME_SIZE |
| 30 |
+#endif |
| 31 |
+#endif |
| 32 |
|
| 33 |
JNIEXPORT jboolean JNICALL Java_com_panayotis_jubler_media_preview_decoders_FFMPEG_createClip(JNIEnv * env, jobject this, jstring audio, jstring wav, jlong start, jlong stop) { |
| 34 |
const char * audio_c; |
| 35 |
diff --git a/Jubler-4.6.1/resources/ffmpeg/ffdecode/makecache.c b/Jubler-4.6.1/resources/ffmpeg/ffdecode/makecache.c |
| 36 |
index d7ea88b..0190b79 100644 |
| 37 |
--- a/Jubler-4.6.1/resources/ffmpeg/ffdecode/makecache.c |
| 38 |
+++ b/Jubler-4.6.1/resources/ffmpeg/ffdecode/makecache.c |
| 39 |
@@ -38,6 +38,14 @@ |
| 40 |
#include "defaults.h" |
| 41 |
#include "utilities.h" |
| 42 |
|
| 43 |
+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE |
| 44 |
+#ifndef MAX_AUDIO_FRAME_SIZE |
| 45 |
+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio |
| 46 |
+#else |
| 47 |
+#define AVCODEC_MAX_AUDIO_FRAME_SIZE MAX_AUDIO_FRAME_SIZE |
| 48 |
+#endif |
| 49 |
+#endif |
| 50 |
+ |
| 51 |
JNIEXPORT jboolean JNICALL Java_com_panayotis_jubler_media_preview_decoders_NativeDecoder_makeCache(JNIEnv * env, jobject this, jstring audio, jstring cache, jstring original) { |
| 52 |
const char *audio_c; |
| 53 |
const char *cache_c; |
Archives