diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-05-11 18:03:30 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-05-11 18:03:30 +0000 |
| commit | e2f1eedbd9fcc14d6a8715c8a6d031d3721a9fa3 (patch) | |
| tree | fc6595fb4800304440d1cf5fb451b139826afdd0 /media-sound/moc/files | |
| parent | Apply patch to fix compile with USE -vorbis wrt #200629. (diff) | |
| download | gentoo-2-e2f1eedbd9fcc14d6a8715c8a6d031d3721a9fa3.tar.gz gentoo-2-e2f1eedbd9fcc14d6a8715c8a6d031d3721a9fa3.tar.bz2 gentoo-2-e2f1eedbd9fcc14d6a8715c8a6d031d3721a9fa3.zip | |
Extend ffmpeg patch wrt #258890, thanks to Mateusz Baran.
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/moc/files')
| -rw-r--r-- | media-sound/moc/files/moc-2.5.0_alpha3-ffmpegheaders.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/media-sound/moc/files/moc-2.5.0_alpha3-ffmpegheaders.patch b/media-sound/moc/files/moc-2.5.0_alpha3-ffmpegheaders.patch index dd4972fe798e..be1180b24966 100644 --- a/media-sound/moc/files/moc-2.5.0_alpha3-ffmpegheaders.patch +++ b/media-sound/moc/files/moc-2.5.0_alpha3-ffmpegheaders.patch @@ -26,3 +26,30 @@ Index: moc-2.5.0-alpha3/decoder_plugins/ffmpeg/ffmpeg.c /* FFmpeg also likes common names, without that, our common.h and log.h would * not be included. */ +Index: moc-2.5.0-alpha3/decoder_plugins/ffmpeg/ffmpeg.c +=================================================================== +--- moc-2.5.0-alpha3.orig/decoder_plugins/ffmpeg/ffmpeg.c ++++ moc-2.5.0-alpha3/decoder_plugins/ffmpeg/ffmpeg.c +@@ -228,12 +228,12 @@ + { + struct ffmpeg_data *data = (struct ffmpeg_data *)prv_data; + int ret; +- int data_size; + char avbuf[AVCODEC_MAX_AUDIO_FRAME_SIZE * sizeof(int16_t)]; + AVPacket pkt; + uint8_t *pkt_data; + int pkt_size = 0; + int filled = 0; ++ int data_size = sizeof(avbuf); + + decoder_error_clear (&data->error); + +@@ -276,7 +276,7 @@ + while (pkt_size) { + int len; + +- len = avcodec_decode_audio (data->enc, (int16_t *)avbuf, ++ len = avcodec_decode_audio2 (data->enc, (int16_t *)avbuf, + &data_size, pkt_data, pkt_size); + debug ("Decoded %dB", data_size); + |