commit 6f00bace41eb92ec383c4ecdcb9a316556eed0b1
Author: Jan Rękorajski <[email protected]>
Date: Thu Aug 29 19:31:23 2013 +0200
- fix building with ffmpeg2
gmerlin-avdecoder-ffmpeg2.patch | 60 +++++++++++++++++++++++++++++++++++++++++
gmerlin-avdecoder.spec | 2 ++
2 files changed, 62 insertions(+)
---
diff --git a/gmerlin-avdecoder.spec b/gmerlin-avdecoder.spec
index 0427281..6b4eaeb 100644
--- a/gmerlin-avdecoder.spec
+++ b/gmerlin-avdecoder.spec
@@ -17,6 +17,7 @@ Patch0: %{name}-cflags.patch
Patch1: %{name}-ffmpeg-0.8.patch
Patch2: %{name}-link.patch
Patch3: %{name}-am.patch
+Patch4: %{name}-ffmpeg2.patch
URL: http://gmerlin.sourceforge.net/avdec_frame.html
BuildRequires: a52dec-libs-devel >= 0.7.4
BuildRequires: autoconf >= 2.50
@@ -159,6 +160,7 @@ Wtyczki avdec dla biblioteki Gmerlin.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
%{__libtoolize}
diff --git a/gmerlin-avdecoder-ffmpeg2.patch b/gmerlin-avdecoder-ffmpeg2.patch
new file mode 100644
index 0000000..4b14d0c
--- /dev/null
+++ b/gmerlin-avdecoder-ffmpeg2.patch
@@ -0,0 +1,60 @@
+--- gmerlin-avdecoder-1.2.0/lib/demux_ffmpeg.c~ 2012-06-08
13:51:34.000000000 +0200
++++ gmerlin-avdecoder-1.2.0/lib/demux_ffmpeg.c 2013-08-29 19:28:23.730802737
+0200
+@@ -209,7 +209,7 @@
+
+ typedef struct
+ {
+- enum CodecID id;
++ enum AVCodecID id;
+ uint32_t fourcc;
+ int bits; /* For audio codecs */
+ uint32_t codec_tag;
+@@ -347,7 +347,7 @@
+
+ typedef struct
+ {
+- enum CodecID id;
++ enum AVCodecID id;
+ uint32_t fourcc;
+ } video_codec_map_t;
+
+--- gmerlin-avdecoder-1.2.0/lib/audio_ffmpeg.c~ 2012-06-08
13:51:34.000000000 +0200
++++ gmerlin-avdecoder-1.2.0/lib/audio_ffmpeg.c 2013-08-29 19:28:41.767694837
+0200
+@@ -99,7 +99,7 @@
+ {
+ const char * decoder_name;
+ const char * format_name;
+- enum CodecID ffmpeg_id;
++ enum AVCodecID ffmpeg_id;
+ uint32_t * fourccs;
+ int codec_tag;
+ int preroll;
+--- gmerlin-avdecoder-1.2.0/lib/video_ffmpeg.c~ 2012-06-08
13:51:34.000000000 +0200
++++ gmerlin-avdecoder-1.2.0/lib/video_ffmpeg.c 2013-08-29 19:29:53.311922098
+0200
+@@ -92,7 +92,7 @@
+ {
+ const char * decoder_name;
+ const char * format_name;
+- enum CodecID ffmpeg_id;
++ enum AVCodecID ffmpeg_id;
+ uint32_t * fourccs;
+
+ int (*get_format)(bgav_stream_t*, bgav_packet_t * p);
+@@ -695,7 +695,7 @@
+ }
+
+ #ifdef HAVE_VDPAU
+-static AVCodec * find_decoder(enum CodecID id, bgav_stream_t * s)
++static AVCodec * find_decoder(enum AVCodecID id, bgav_stream_t * s)
+ {
+ AVCodec * ret = NULL;
+
+@@ -740,7 +740,7 @@
+ }
+ }
+
+-static int init_vdpau(bgav_stream_t * s, enum CodecID id)
++static int init_vdpau(bgav_stream_t * s, enum AVCodecID id)
+ {
+ int i;
+ ffmpeg_video_priv * priv = s->data.video.decoder->priv;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gmerlin-avdecoder.git/commitdiff/6f00bace41eb92ec383c4ecdcb9a316556eed0b1
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
