mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-02 01:20:54 +00:00
Unbreak compilation caused by removal of C++ compatibility wrappers
from include files that are installed by ffmpeg. The ffmpeg developers wanted to make it clear, that C++ is not officially supported.
This commit is contained in:
parent
2960e9f2b1
commit
8b8a92680a
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=195788
12
multimedia/dvbcut/files/patch-avframe.h
Normal file
12
multimedia/dvbcut/files/patch-avframe.h
Normal file
@ -0,0 +1,12 @@
|
||||
--- src/avframe.h~ 2007-04-13 19:36:27 +0200
|
||||
+++ src/avframe.h 2007-07-17 01:08:23 +0200
|
||||
@@ -19,7 +19,9 @@
|
||||
#ifndef _DVBCUT_AVFRAME_H
|
||||
#define _DVBCUT_AVFRAME_H
|
||||
|
||||
+extern "C" {
|
||||
#include <ffmpeg/avcodec.h>
|
||||
+}
|
||||
|
||||
class QImage;
|
||||
|
12
multimedia/dvbcut/files/patch-lavfmuxer.cpp
Normal file
12
multimedia/dvbcut/files/patch-lavfmuxer.cpp
Normal file
@ -0,0 +1,12 @@
|
||||
--- src/lavfmuxer.cpp~ 2007-04-13 19:36:27.000000000 +0200
|
||||
+++ src/lavfmuxer.cpp 2007-07-17 01:09:12 +0200
|
||||
@@ -16,7 +16,9 @@
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
+extern "C" {
|
||||
#include <ffmpeg/avformat.h>
|
||||
+}
|
||||
#include <string.h>
|
||||
#include <utility>
|
||||
#include <list>
|
12
multimedia/dvbcut/files/patch-main.cpp
Normal file
12
multimedia/dvbcut/files/patch-main.cpp
Normal file
@ -0,0 +1,12 @@
|
||||
--- src/main.cpp~ 2007-04-13 19:36:26 +0200
|
||||
+++ src/main.cpp 2007-07-17 01:10:36 +0200
|
||||
@@ -27,7 +27,9 @@
|
||||
#endif // HAVE_LIB_AO
|
||||
|
||||
#include <qapplication.h>
|
||||
+extern "C" {
|
||||
#include <ffmpeg/avformat.h>
|
||||
+}
|
||||
#include <qimage.h>
|
||||
#include <qsettings.h>
|
||||
#include "dvbcut.h"
|
12
multimedia/dvbcut/files/patch-mpgfile.h
Normal file
12
multimedia/dvbcut/files/patch-mpgfile.h
Normal file
@ -0,0 +1,12 @@
|
||||
--- src/mpgfile.h~ 2007-04-13 19:36:27 +0200
|
||||
+++ src/mpgfile.h 2007-07-17 01:10:56 +0200
|
||||
@@ -19,7 +19,9 @@
|
||||
#ifndef _DVBCUT_MPGFILE_H
|
||||
#define _DVBCUT_MPGFILE_H
|
||||
|
||||
+extern "C" {
|
||||
#include <ffmpeg/avcodec.h>
|
||||
+}
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <list>
|
@ -1,6 +1,16 @@
|
||||
--- src/playaudio.cpp~ Fri Apr 13 19:36:27 2007
|
||||
+++ src/playaudio.cpp Sat Jun 2 20:51:00 2007
|
||||
@@ -38,7 +38,10 @@
|
||||
+++ src/playaudio.cpp 2007-07-17 01:11:15 +0200
|
||||
@@ -19,7 +19,9 @@
|
||||
#ifdef HAVE_LIB_AO
|
||||
#include <stdio.h>
|
||||
#include <ao/ao.h>
|
||||
+extern "C" {
|
||||
#include <ffmpeg/avcodec.h>
|
||||
+}
|
||||
#include "playaudio.h"
|
||||
|
||||
#define MIN_BUFFER_SAMPLES (1536*6)
|
||||
@@ -38,7 +40,10 @@
|
||||
const uint8_t *d=(const uint8_t*)data;
|
||||
|
||||
while (len>0) {
|
||||
|
@ -1,6 +1,16 @@
|
||||
--- src/psfile.cpp~ Fri Apr 13 19:36:27 2007
|
||||
+++ src/psfile.cpp Tue May 1 21:45:19 2007
|
||||
@@ -100,7 +100,7 @@
|
||||
+++ src/psfile.cpp 2007-07-17 01:11:44 +0200
|
||||
@@ -19,7 +19,9 @@
|
||||
#include "psfile.h"
|
||||
#include "streamhandle.h"
|
||||
#include "stream.h"
|
||||
+extern "C" {
|
||||
#include <ffmpeg/avcodec.h>
|
||||
+}
|
||||
|
||||
psfile::psfile(const std::string &filename, inbuffer &b, int initial_offset)
|
||||
: mpgfile(filename, b, initial_offset)
|
||||
@@ -100,7 +102,7 @@
|
||||
streamnumber[sid]=audiostream(audiostreams);
|
||||
stream *S=&s[audiostream(audiostreams++)];
|
||||
S->id=sid;
|
||||
|
12
multimedia/dvbcut/files/patch-streamdata.h
Normal file
12
multimedia/dvbcut/files/patch-streamdata.h
Normal file
@ -0,0 +1,12 @@
|
||||
--- src/streamdata.h~ 2007-04-13 19:36:27 +0200
|
||||
+++ src/streamdata.h 2007-07-17 01:12:01 +0200
|
||||
@@ -21,7 +21,9 @@
|
||||
|
||||
#include <string>
|
||||
#include <list>
|
||||
+extern "C" {
|
||||
#include <ffmpeg/avformat.h>
|
||||
+}
|
||||
|
||||
#include "port.h"
|
||||
#include "tsfile.h"
|
@ -1,6 +1,16 @@
|
||||
--- src/tsfile.cpp~ Fri Apr 13 19:36:27 2007
|
||||
+++ src/tsfile.cpp Tue May 1 21:45:36 2007
|
||||
@@ -78,7 +78,7 @@
|
||||
+++ src/tsfile.cpp 2007-07-17 01:12:25 +0200
|
||||
@@ -22,7 +22,9 @@
|
||||
#include <list>
|
||||
#include <utility>
|
||||
|
||||
+extern "C" {
|
||||
#include <ffmpeg/avcodec.h>
|
||||
+}
|
||||
|
||||
tsfile::tsfile(const std::string &filename, inbuffer &b, int initial_offset)
|
||||
: mpgfile(filename, b, initial_offset)
|
||||
@@ -78,7 +80,7 @@
|
||||
stream *S=&s[audiostream(audiostreams++)];
|
||||
S->id=it->second;
|
||||
if (it->first==0xbd) {
|
||||
|
Loading…
Reference in New Issue
Block a user