rpms/opencv
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add more fourcc

Browse Source
This commit is contained in:
Nicolas Chauvet 2013-01-20 22:02:29 +01:00
parent 83807c82fe
commit 877aad413e
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
OpenCV-2.4.3-codecs.patch Normal file
View File

@ -0,0 +1,27 @@
diff -up OpenCV-2.4.3/modules/highgui/src/cap_gstreamer.cpp.codecs OpenCV-2.4.3/modules/highgui/src/cap_gstreamer.cpp
--- OpenCV-2.4.3/modules/highgui/src/cap_gstreamer.cpp.codecs 2012-09-06 00:55:12.000000000 +0200
+++ OpenCV-2.4.3/modules/highgui/src/cap_gstreamer.cpp 2013-01-06 00:14:14.628006270 +0100
@@ -442,12 +442,19 @@ protected:
void CvVideoWriter_GStreamer::init()
{
- encs[CV_FOURCC('H','F','Y','U')]=(char*)"ffenc_huffyuv";
encs[CV_FOURCC('D','R','A','C')]=(char*)"diracenc";
- encs[CV_FOURCC('X','V','I','D')]=(char*)"xvidenc";
- encs[CV_FOURCC('X','2','6','4')]=(char*)"x264enc";
+ encs[CV_FOURCC('H','F','Y','U')]=(char*)"ffenc_huffyuv";
+ encs[CV_FOURCC('J','P','E','G')]=(char*)"jpegenc";
+ encs[CV_FOURCC('M','J','P','G')]=(char*)"jpegenc";
encs[CV_FOURCC('M','P','1','V')]=(char*)"mpeg2enc";
- //encs[CV_FOURCC('M','P','2','V')]=(char*)"mpeg2enc";
+ encs[CV_FOURCC('M','P','2','V')]=(char*)"mpeg2enc";
+ encs[CV_FOURCC('T','H','E','O')]=(char*)"theoraenc";
+ encs[CV_FOURCC('V','P','8','0')]=(char*)"vp8enc";
+ encs[CV_FOURCC('H','2','6','4')]=(char*)"x264enc";
+ encs[CV_FOURCC('X','2','6','4')]=(char*)"x264enc";
+ encs[CV_FOURCC('X','V','I','D')]=(char*)"xvidenc";
+ encs[CV_FOURCC('F','F','Y','U')]=(char*)"y4menc";
+ //encs[CV_FOURCC('H','F','Y','U')]=(char*)"y4menc";
pipeline=0;
buffer=0;
}

9
opencv.spec
View File

@ -5,7 +5,7 @@
Name: opencv
Version: 2.4.3
Release: 4%{?dist}
Release: 5%{?dist}
Summary: Collection of algorithms for computer vision
Group: Development/Libraries
@ -16,7 +16,10 @@ Source0: http://prdownloads.sourceforge.net/opencvlibrary/%{tar_name}-%{v
Source1: opencv-samples-Makefile
Patch0: opencv-pkgcmake.patch
Patch1: opencv-pkgcmake2.patch
#http://code.opencv.org/issues/2720
Patch2: opencv-pillow.patch
#http://code.opencv.org/issues/2721
Patch3: OpenCV-2.4.3-codecs.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libtool
@ -101,6 +104,7 @@ This package contains Python bindings for the OpenCV library.
%patch0 -p1 -b .pkgcmake
%patch1 -p1 -b .pkgcmake2
%patch2 -p1 -b .pillow
%patch3 -p1 -b .codecs
# fix dos end of lines
sed -i 's|\r||g' samples/c/adaptiveskindetector.cpp
@ -230,6 +234,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Sun Jan 20 2013 Nicolas Chauvet <kwizart@gmail.com> - 2.4.3-5
- Add more FourCC for gstreamer
* Sun Jan 20 2013 Nicolas Chauvet <kwizart@gmail.com> - 2.4.3-4
- Allow to use python-pillow - rhbz#895767