| 1 |
ssuominen 09/05/11 18:03:29 |
| 2 |
|
| 3 |
Modified: moc-2.5.0_alpha3-ffmpegheaders.patch |
| 4 |
Log: |
| 5 |
Extend ffmpeg patch wrt #258890, thanks to Mateusz Baran. |
| 6 |
(Portage version: 2.1.6.13/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 media-sound/moc/files/moc-2.5.0_alpha3-ffmpegheaders.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/moc/files/moc-2.5.0_alpha3-ffmpegheaders.patch?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/moc/files/moc-2.5.0_alpha3-ffmpegheaders.patch?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/moc/files/moc-2.5.0_alpha3-ffmpegheaders.patch?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: moc-2.5.0_alpha3-ffmpegheaders.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/moc/files/moc-2.5.0_alpha3-ffmpegheaders.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- moc-2.5.0_alpha3-ffmpegheaders.patch 8 Apr 2008 21:07:00 -0000 1.1 |
| 22 |
+++ moc-2.5.0_alpha3-ffmpegheaders.patch 11 May 2009 18:03:29 -0000 1.2 |
| 23 |
@@ -26,3 +26,30 @@ |
| 24 |
|
| 25 |
/* FFmpeg also likes common names, without that, our common.h and log.h would |
| 26 |
* not be included. */ |
| 27 |
+Index: moc-2.5.0-alpha3/decoder_plugins/ffmpeg/ffmpeg.c |
| 28 |
+=================================================================== |
| 29 |
+--- moc-2.5.0-alpha3.orig/decoder_plugins/ffmpeg/ffmpeg.c |
| 30 |
++++ moc-2.5.0-alpha3/decoder_plugins/ffmpeg/ffmpeg.c |
| 31 |
+@@ -228,12 +228,12 @@ |
| 32 |
+ { |
| 33 |
+ struct ffmpeg_data *data = (struct ffmpeg_data *)prv_data; |
| 34 |
+ int ret; |
| 35 |
+- int data_size; |
| 36 |
+ char avbuf[AVCODEC_MAX_AUDIO_FRAME_SIZE * sizeof(int16_t)]; |
| 37 |
+ AVPacket pkt; |
| 38 |
+ uint8_t *pkt_data; |
| 39 |
+ int pkt_size = 0; |
| 40 |
+ int filled = 0; |
| 41 |
++ int data_size = sizeof(avbuf); |
| 42 |
+ |
| 43 |
+ decoder_error_clear (&data->error); |
| 44 |
+ |
| 45 |
+@@ -276,7 +276,7 @@ |
| 46 |
+ while (pkt_size) { |
| 47 |
+ int len; |
| 48 |
+ |
| 49 |
+- len = avcodec_decode_audio (data->enc, (int16_t *)avbuf, |
| 50 |
++ len = avcodec_decode_audio2 (data->enc, (int16_t *)avbuf, |
| 51 |
+ &data_size, pkt_data, pkt_size); |
| 52 |
+ debug ("Decoded %dB", data_size); |
| 53 |
+ |
Archives