| 1 |
scarabeus 11/05/01 17:05:43 |
| 2 |
|
| 3 |
Added: moc-ffmpeg.patch |
| 4 |
Log: |
| 5 |
Add patch to compile with new ffmpeg api. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-sound/moc/files/moc-ffmpeg.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/moc/files/moc-ffmpeg.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/moc/files/moc-ffmpeg.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: moc-ffmpeg.patch |
| 16 |
=================================================================== |
| 17 |
Index: decoder_plugins/ffmpeg/ffmpeg.c |
| 18 |
=================================================================== |
| 19 |
--- decoder_plugins/ffmpeg/ffmpeg.c (revision 2307) |
| 20 |
+++ decoder_plugins/ffmpeg/ffmpeg.c (working copy) |
| 21 |
@@ -28,12 +28,6 @@ |
| 22 |
#include <ffmpeg/avformat.h> |
| 23 |
#endif |
| 24 |
|
| 25 |
-/* libavformat's API will be changing at version 53, but at present there |
| 26 |
- * appears to be no guidance on what will replace the deprecated fields. */ |
| 27 |
-#ifndef FF_API_OLD_METADATA |
| 28 |
-#define FF_API_OLD_METADATA (LIBAVFORMAT_VERSION_MAJOR < 53) |
| 29 |
-#endif |
| 30 |
- |
| 31 |
/* FFmpeg also likes common names, without that, our common.h and log.h |
| 32 |
* would not be included. */ |
| 33 |
#undef COMMON_H |
| 34 |
@@ -137,7 +131,7 @@ |
| 35 |
av_read_play (data->ic); |
| 36 |
for (i = 0; i < data->ic->nb_streams; i++) { |
| 37 |
data->enc = data->ic->streams[i]->codec; |
| 38 |
- if (data->enc->codec_type == CODEC_TYPE_AUDIO) { |
| 39 |
+ if (data->enc->codec_type == AVMEDIA_TYPE_AUDIO) { |
| 40 |
audio_index = i; |
| 41 |
break; |
| 42 |
} |
Archives