Group :: Sistema/Bibliotecas
RPM: libvalhalla
Navegação
Main Changelog Spec Patches Sources Download Gear Bugs e FR Repocop
Patch: libvalhalla-2.0.0-libavformat-defines.patch
Download
Download
# HG changeset patch
# User Davide Cavalca <davide@geexbox.org>
# Date 1313566462 -7200
# Node ID 70494a8fd3f563a4c026e60d5b7344bb572b3797
# Parent f90b201e130c86484380286d4ce08766bf48365c
fix build with libav 0.7 (patch by Fabrice Coutadeur <fabricesp at ubuntu dot com>)
diff -r f90b201e130c -r 70494a8fd3f5 src/grabber_ffmpeg.c
--- a/src/grabber_ffmpeg.c Sun Aug 14 09:01:19 2011 +0200
+++ b/src/grabber_ffmpeg.c Wed Aug 17 09:34:22 2011 +0200
@@ -89,7 +89,11 @@
switch (codec->codec_type)
{+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
+ case AVMEDIA_TYPE_AUDIO:
+#else
case CODEC_TYPE_AUDIO:
+#endif
audio_streams++;
name = grabber_ffmpeg_codec_name (codec->codec_id);
if (name)
@@ -103,7 +107,11 @@
VALHALLA_METADATA_AUDIO_BITRATE, ffmpeg->pl);
break;
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
+ case AVMEDIA_TYPE_VIDEO:
+#else
case CODEC_TYPE_VIDEO:
+#endif
/* Common part (image + video) */
video_streams++;
name = grabber_ffmpeg_codec_name (codec->codec_id);
@@ -138,7 +146,11 @@
VALHALLA_METADATA_VIDEO_ASPECT, ffmpeg->pl);
break;
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
+ case AVMEDIA_TYPE_SUBTITLE:
+#else
case CODEC_TYPE_SUBTITLE:
+#endif
sub_streams++;
break;
diff -r f90b201e130c -r 70494a8fd3f5 src/parser.c
--- a/src/parser.c Sun Aug 14 09:01:19 2011 +0200
+++ b/src/parser.c Wed Aug 17 09:34:22 2011 +0200
@@ -343,10 +343,21 @@
for (i = 0; i < ctx->nb_streams; i++)
{AVStream *st = ctx->streams[i];
-
- if (st->codec->codec_type == CODEC_TYPE_VIDEO)
+ if (st->codec->codec_type ==
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
+ AVMEDIA_TYPE_VIDEO
+#else
+ CODEC_TYPE_VIDEO
+#endif
+ )
video_st = 1;
- else if (st->codec->codec_type == CODEC_TYPE_AUDIO)
+ else if (st->codec->codec_type ==
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
+ AVMEDIA_TYPE_AUDIO
+#else
+ CODEC_TYPE_AUDIO
+#endif
+ )
audio_st = 1;
}