| 1 |
aballier 09/01/31 15:24:45 |
| 2 |
|
| 3 |
Modified: 120_all_newffmpeg.patch 130_all_swscalecall.patch |
| 4 |
Log: |
| 5 |
refresh the whole patchset and more fixes for latest ffmpeg |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.2 src/patchsets/gpac/0.4.5/120_all_newffmpeg.patch |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/120_all_newffmpeg.patch?rev=1.2&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/120_all_newffmpeg.patch?rev=1.2&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/120_all_newffmpeg.patch?r1=1.1&r2=1.2 |
| 13 |
|
| 14 |
Index: 120_all_newffmpeg.patch |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo/src/patchsets/gpac/0.4.5/120_all_newffmpeg.patch,v |
| 17 |
retrieving revision 1.1 |
| 18 |
retrieving revision 1.2 |
| 19 |
diff -u -r1.1 -r1.2 |
| 20 |
--- 120_all_newffmpeg.patch 31 Jan 2009 15:08:13 -0000 1.1 |
| 21 |
+++ 120_all_newffmpeg.patch 31 Jan 2009 15:24:45 -0000 1.2 |
| 22 |
@@ -11,3 +11,13 @@ |
| 23 |
ffd->ctx->frame_size = (ffd->ctx->sample_rate > 24000) ? 1152 : 576; |
| 24 |
} |
| 25 |
/*may be 0 (cfg not known yet)*/ |
| 26 |
+@@ -446,7 +446,8 @@ static GF_Err FFDEC_ProcessData(GF_Media |
| 27 |
+ if (ffd->frame_start>inBufferLength) ffd->frame_start = 0; |
| 28 |
+ |
| 29 |
+ redecode: |
| 30 |
+- len = avcodec_decode_audio(ffd->ctx, (short *)ffd->audio_buf, &gotpic, inBuffer + ffd->frame_start, inBufferLength - ffd->frame_start); |
| 31 |
++ gotpic=AVCODEC_MAX_AUDIO_FRAME_SIZE; |
| 32 |
++ len = avcodec_decode_audio2(ffd->ctx, (short *)ffd->audio_buf, &gotpic, inBuffer + ffd->frame_start, inBufferLength - ffd->frame_start); |
| 33 |
+ |
| 34 |
+ if (len<0) { ffd->frame_start = 0; return GF_NON_COMPLIANT_BITSTREAM; } |
| 35 |
+ if (gotpic<0) { ffd->frame_start = 0; return GF_OK; } |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.2 src/patchsets/gpac/0.4.5/130_all_swscalecall.patch |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/130_all_swscalecall.patch?rev=1.2&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/130_all_swscalecall.patch?rev=1.2&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/130_all_swscalecall.patch?r1=1.1&r2=1.2 |
| 44 |
|
| 45 |
Index: 130_all_swscalecall.patch |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo/src/patchsets/gpac/0.4.5/130_all_swscalecall.patch,v |
| 48 |
retrieving revision 1.1 |
| 49 |
retrieving revision 1.2 |
| 50 |
diff -u -r1.1 -r1.2 |
| 51 |
--- 130_all_swscalecall.patch 31 Jan 2009 15:08:13 -0000 1.1 |
| 52 |
+++ 130_all_swscalecall.patch 31 Jan 2009 15:24:45 -0000 1.2 |
| 53 |
@@ -2,7 +2,7 @@ |
| 54 |
=================================================================== |
| 55 |
--- gpac.orig/modules/ffmpeg_in/ffmpeg_decode.c |
| 56 |
+++ gpac/modules/ffmpeg_in/ffmpeg_decode.c |
| 57 |
-@@ -643,7 +643,7 @@ redecode: |
| 58 |
+@@ -644,7 +644,7 @@ redecode: |
| 59 |
NULL, NULL, NULL); |
| 60 |
|
| 61 |
if (ffd->sws_ctx) |
Archives