Gentoo Archives: gentoo-commits

From: "Olivier Crete (tester)" <tester@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-video/mpeg4ip/files: mpeg4ip-1.5.0.1-avcodec_extern_c.patch digest-mpeg4ip-1.5.0.1-r4
Date: Sat, 12 Jan 2008 21:03:57
Message-Id: E1JDnWE-00027R-Ky@stork.gentoo.org
1 tester 08/01/12 21:03:54
2
3 Added: mpeg4ip-1.5.0.1-avcodec_extern_c.patch
4 digest-mpeg4ip-1.5.0.1-r4
5 Log:
6 Add patch to make it compile with ffmpeg, bug #188183
7 (Portage version: 2.1.3.19)
8
9 Revision Changes Path
10 1.1 media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-avcodec_extern_c.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-avcodec_extern_c.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-avcodec_extern_c.patch?rev=1.1&content-type=text/plain
14
15 Index: mpeg4ip-1.5.0.1-avcodec_extern_c.patch
16 ===================================================================
17 --- mpeg4ip-1.5.0.1/server/mp4live/audio_ffmpeg.h.unpatched 2007-11-24 09:07:06.000000000 +0100
18 +++ mpeg4ip-1.5.0.1/server/mp4live/audio_ffmpeg.h 2007-11-24 09:11:03.000000000 +0100
19 @@ -24,9 +24,13 @@
20
21 #include "audio_encoder.h"
22 #ifdef HAVE_FFMPEG_INSTALLED
23 +extern "C" {
24 #include <ffmpeg/avcodec.h>
25 +}
26 #else
27 +extern "C" {
28 #include <avcodec.h>
29 +}
30 #endif
31 #include <sdp.h>
32
33 --- mpeg4ip-1.5.0.1/server/mp4live/video_ffmpeg.h.unpatched 2007-11-24 09:09:04.000000000 +0100
34 +++ mpeg4ip-1.5.0.1/server/mp4live/video_ffmpeg.h 2007-11-24 09:10:18.000000000 +0100
35 @@ -24,9 +24,13 @@
36
37 #include "video_encoder.h"
38 #ifdef HAVE_FFMPEG_INSTALLED
39 +extern "C" {
40 #include <ffmpeg/avcodec.h>
41 +}
42 #else
43 +extern "C" {
44 #include <avcodec.h>
45 +}
46 #endif
47
48 class CFfmpegVideoEncoder : public CVideoEncoder {
49 --- mpeg4ip-1.5.0.1/server/mp4live/video_encoder_class.cpp.unpatched 2007-11-24 09:11:51.000000000 +0100
50 +++ mpeg4ip-1.5.0.1/server/mp4live/video_encoder_class.cpp 2007-11-24 09:12:17.000000000 +0100
51 @@ -26,9 +26,13 @@
52 #include "video_util_filter.h"
53 #ifdef HAVE_FFMPEG
54 #ifdef HAVE_FFMPEG_INSTALLED
55 +extern "C" {
56 #include <ffmpeg/avcodec.h>
57 +}
58 #else
59 +extern "C" {
60 #include <avcodec.h>
61 +}
62 #endif
63 #endif
64
65
66
67
68 1.1 media-video/mpeg4ip/files/digest-mpeg4ip-1.5.0.1-r4
69
70 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mpeg4ip/files/digest-mpeg4ip-1.5.0.1-r4?rev=1.1&view=markup
71 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mpeg4ip/files/digest-mpeg4ip-1.5.0.1-r4?rev=1.1&content-type=text/plain
72
73 Index: digest-mpeg4ip-1.5.0.1-r4
74 ===================================================================
75 MD5 f53b06c62e914ab724bda9d9af041e08 mpeg4ip-1.5.0.1.tar.gz 4826180
76 RMD160 fee5c21c17a470e6de349e07d233a1eb46b2064a mpeg4ip-1.5.0.1.tar.gz 4826180
77 SHA256 23535dd818898ec75ffa0df22d9f27189e77361ce8a500d58328073ee247bcb6 mpeg4ip-1.5.0.1.tar.gz 4826180
78
79
80
81 --
82 gentoo-commits@l.g.o mailing list