projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4e01ce3
)
mpeg2enc: support mjpegtools 2.0
author
Götz Waschk
<waschk@mandriva.org>
Tue, 24 May 2011 13:42:44 +0000
(15:42 +0200)
committer
David Schleef
<ds@schleef.org>
Wed, 25 May 2011 00:15:17 +0000
(17:15 -0700)
This adds conditional includes for the renamed headers in mjpegtools 2.0.
Fixes: #650970.
ext/mpeg2enc/gstmpeg2encoder.cc
patch
|
blob
|
history
diff --git
a/ext/mpeg2enc/gstmpeg2encoder.cc
b/ext/mpeg2enc/gstmpeg2encoder.cc
index
acfda50
..
31f1a30
100644
(file)
--- a/
ext/mpeg2enc/gstmpeg2encoder.cc
+++ b/
ext/mpeg2enc/gstmpeg2encoder.cc
@@
-26,7
+26,10
@@
#include <mpegconsts.h>
#include <quantize.hh>
-#if GST_MJPEGTOOLS_API >= 10900
+#if GST_MJPEGTOOLS_API >= 10903
+#include <ontheflyratectlpass1.hh>
+#include <ontheflyratectlpass2.hh>
+#elif GST_MJPEGTOOLS_API >= 10900
#include <ontheflyratectl.hh>
#include <pass1ratectl.hh>
#include <pass2ratectl.hh>