Annotation of /trunk/gst-plugins-bad/patches/gst-plugins-bad-0.10.22-mjpeg-2.0.patch
Parent Directory
| 
Revision Log
Revision 1645 -
(hide annotations)
(download)
Fri Feb 17 00:39:00 2012 UTC (12 years, 3 months ago) by niro
File size: 855 byte(s)
Fri Feb 17 00:39:00 2012 UTC (12 years, 3 months ago) by niro
File size: 855 byte(s)
-added build fix for mjpeg-2.0
| 1 | niro | 1645 | From 407b02578689804dc6bc47e53be9e87cc1b25597 Mon Sep 17 00:00:00 2001 |
| 2 | From: Götz Waschk <waschk@mandriva.org> | ||
| 3 | Date: Tue, 24 May 2011 13:42:44 +0000 | ||
| 4 | Subject: mpeg2enc: support mjpegtools 2.0 | ||
| 5 | |||
| 6 | This adds conditional includes for the renamed headers in mjpegtools 2.0. | ||
| 7 | Fixes: #650970. | ||
| 8 | --- | ||
| 9 | (limited to 'ext/mpeg2enc') | ||
| 10 | |||
| 11 | diff --git a/ext/mpeg2enc/gstmpeg2encoder.cc b/ext/mpeg2enc/gstmpeg2encoder.cc | ||
| 12 | index acfda50..31f1a30 100644 | ||
| 13 | --- a/ext/mpeg2enc/gstmpeg2encoder.cc | ||
| 14 | +++ b/ext/mpeg2enc/gstmpeg2encoder.cc | ||
| 15 | @@ -26,7 +26,10 @@ | ||
| 16 | |||
| 17 | #include <mpegconsts.h> | ||
| 18 | #include <quantize.hh> | ||
| 19 | -#if GST_MJPEGTOOLS_API >= 10900 | ||
| 20 | +#if GST_MJPEGTOOLS_API >= 10903 | ||
| 21 | +#include <ontheflyratectlpass1.hh> | ||
| 22 | +#include <ontheflyratectlpass2.hh> | ||
| 23 | +#elif GST_MJPEGTOOLS_API >= 10900 | ||
| 24 | #include <ontheflyratectl.hh> | ||
| 25 | #include <pass1ratectl.hh> | ||
| 26 | #include <pass2ratectl.hh> | ||
| 27 | -- | ||
| 28 | cgit v0.9.0.2-2-gbebe |