hornetseye-ffmpeg 1.1.5 → 1.1.6
Sign up to get free protection for your applications and to get access to all the features.
- data/Rakefile +9 -3
- data/ext/avinput.hh +5 -3
- data/ext/avoutput.hh +5 -3
- metadata +8 -8
data/Rakefile
CHANGED
|
@@ -7,7 +7,7 @@ require 'rake/loaders/makefile'
|
|
|
7
7
|
require 'rbconfig'
|
|
8
8
|
|
|
9
9
|
PKG_NAME = 'hornetseye-ffmpeg'
|
|
10
|
-
PKG_VERSION = '1.1.
|
|
10
|
+
PKG_VERSION = '1.1.6'
|
|
11
11
|
CFG = RbConfig::CONFIG
|
|
12
12
|
CXX = ENV[ 'CXX' ] || 'g++'
|
|
13
13
|
RB_FILES = FileList[ 'lib/**/*.rb' ]
|
|
@@ -104,10 +104,16 @@ file 'ext/config.h' do |t|
|
|
|
104
104
|
# need to compile with -D__STDC_CONSTANT_MACROS
|
|
105
105
|
if check_c_header 'libswscale/swscale.h'
|
|
106
106
|
s << "#define HAVE_LIBSWSCALE_INCDIR 1\n"
|
|
107
|
-
|
|
107
|
+
s << "#undef HAVE_FFMPEG_LIBSWSCALE_INCDIR 1\n"
|
|
108
|
+
elsif check_c_header 'ffmpeg/libswscale/swscale.h'
|
|
108
109
|
s << "#undef HAVE_LIBSWSCALE_INCDIR\n"
|
|
110
|
+
s << "#define HAVE_FFMPEG_LIBSWSCALE_INCDIR 1\n"
|
|
109
111
|
else
|
|
110
|
-
|
|
112
|
+
unless check_c_header 'ffmpeg/swscale.h'
|
|
113
|
+
raise 'Cannot find swscale.h header file'
|
|
114
|
+
end
|
|
115
|
+
s << "#undef HAVE_LIBSWSCALE_INCDIR\n"
|
|
116
|
+
s << "#undef HAVE_FFMPEG_LIBSWSCALE_INCDIR 1\n"
|
|
111
117
|
end
|
|
112
118
|
have_libavformat_incdir = check_c_header 'libavformat/avformat.h'
|
|
113
119
|
if have_libavformat_incdir
|
data/ext/avinput.hh
CHANGED
|
@@ -22,10 +22,12 @@
|
|
|
22
22
|
|
|
23
23
|
#include <boost/shared_ptr.hpp>
|
|
24
24
|
extern "C" {
|
|
25
|
-
#
|
|
26
|
-
#include <libswscale/swscale.h>
|
|
27
|
-
#else
|
|
25
|
+
#ifndef HAVE_LIBSWSCALE_INCDIR
|
|
28
26
|
#include <ffmpeg/swscale.h>
|
|
27
|
+
#elif HAVE_FFMPEG_LIBSWSCALE_INCDIR
|
|
28
|
+
#include <ffmpeg/libswscale/swscale.h>
|
|
29
|
+
#else
|
|
30
|
+
#include <libswscale/swscale.h>
|
|
29
31
|
#endif
|
|
30
32
|
#ifdef HAVE_LIBAVFORMAT_INCDIR
|
|
31
33
|
#include <libavformat/avformat.h>
|
data/ext/avoutput.hh
CHANGED
|
@@ -22,10 +22,12 @@
|
|
|
22
22
|
|
|
23
23
|
#include <boost/shared_ptr.hpp>
|
|
24
24
|
extern "C" {
|
|
25
|
-
#
|
|
26
|
-
#include <libswscale/swscale.h>
|
|
27
|
-
#else
|
|
25
|
+
#ifndef HAVE_LIBSWSCALE_INCDIR
|
|
28
26
|
#include <ffmpeg/swscale.h>
|
|
27
|
+
#elif HAVE_FFMPEG_LIBSWSCALE_INCDIR
|
|
28
|
+
#include <ffmpeg/libswscale/swscale.h>
|
|
29
|
+
#else
|
|
30
|
+
#include <libswscale/swscale.h>
|
|
29
31
|
#endif
|
|
30
32
|
#ifdef HAVE_LIBAVFORMAT_INCDIR
|
|
31
33
|
#include <libavformat/avformat.h>
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: hornetseye-ffmpeg
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.1.
|
|
4
|
+
version: 1.1.6
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2013-
|
|
12
|
+
date: 2013-12-21 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: malloc
|
|
@@ -92,16 +92,16 @@ files:
|
|
|
92
92
|
- lib/hornetseye-ffmpeg/avoutput.rb
|
|
93
93
|
- lib/hornetseye_ffmpeg_ext.rb
|
|
94
94
|
- ext/avinput.cc
|
|
95
|
-
- ext/sequence.cc
|
|
96
|
-
- ext/init.cc
|
|
97
|
-
- ext/frame.cc
|
|
98
95
|
- ext/avoutput.cc
|
|
96
|
+
- ext/frame.cc
|
|
97
|
+
- ext/init.cc
|
|
98
|
+
- ext/sequence.cc
|
|
99
99
|
- ext/avinput.hh
|
|
100
|
-
- ext/
|
|
101
|
-
- ext/frame.hh
|
|
100
|
+
- ext/avoutput.hh
|
|
102
101
|
- ext/error.hh
|
|
102
|
+
- ext/frame.hh
|
|
103
103
|
- ext/rubyinc.hh
|
|
104
|
-
- ext/
|
|
104
|
+
- ext/sequence.hh
|
|
105
105
|
homepage: http://wedesoft.github.com/hornetseye-ffmpeg/
|
|
106
106
|
licenses:
|
|
107
107
|
- GPL-3+
|