| @@ -0,0 +1,313 @@
+--- common/video/iso-mpeg4/include/bitstrm.hpp
++++ common/video/iso-mpeg4/include/bitstrm.hpp
+@@ -45,8 +45,8 @@
+ #ifndef _BITSTREAM_HPP_
+ #define _BITSTREAM_HPP_
+ #include "inbits.h"
+-#include <istream.h>
+-#include <ostream.h>
++#include <istream>
++#include <ostream>
+
+ class CIOBitStream
+ {
+--- common/video/iso-mpeg4/include/entropy.hpp
++++ common/video/iso-mpeg4/include/entropy.hpp
+@@ -39,8 +39,10 @@
+ #ifndef __ENTROPY_HPP_
+ #define __ENTROPY_HPP_
+
+-#include <istream.h>
+-#include <ostream.h>
++#include <istream>
++#include <ostream>
++
++using namespace std;
+
+ class CInBitStream;
+ class COutBitStream;
+--- common/video/iso-mpeg4/include/vopseenc.hpp
++++ common/video/iso-mpeg4/include/vopseenc.hpp
+@@ -79,6 +79,8 @@
+
+ #include "tm5rc.hpp"
+
++using namespace std;
++
+ class CFwdBlockDCT;
+
+ // HHI Schueuer: scan selection classes to support the sadct
+--- common/video/iso-mpeg4/src/app_encoder_encoder.cpp
++++ common/video/iso-mpeg4/src/app_encoder_encoder.cpp
+@@ -99,7 +99,7 @@
+
+ #include "mode.hpp"
+ #include "tm5rc.hpp"
+-#include "fstream.h"
++#include "fstream"
+ #include "sesenc.hpp"
+ // #include "encoder/tps_sesenc.hpp" // deleted by Sharp (98/2/12)
+
+--- common/video/iso-mpeg4/src/sys_encoder_errenc.cpp
++++ common/video/iso-mpeg4/src/sys_encoder_errenc.cpp
+@@ -54,7 +54,7 @@
+ #include <stdio.h>
+ #include <math.h>
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+
+ #include "typeapi.h"
+ #include "codehead.h"
+--- common/video/iso-mpeg4/src/sys_encoder_gmc_enc_util.cpp
++++ common/video/iso-mpeg4/src/sys_encoder_gmc_enc_util.cpp
+@@ -46,7 +46,7 @@
+ #include <stdio.h>
+ #include <math.h>
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <assert.h>
+
+ #include "typeapi.h"
+--- common/video/iso-mpeg4/src/sys_encoder_mbenc.cpp
++++ common/video/iso-mpeg4/src/sys_encoder_mbenc.cpp
+@@ -75,7 +75,7 @@
+
+ #include <stdlib.h>
+ #include <math.h>
+-#include <iostream.h>
++#include <iostream>
+ #include "typeapi.h"
+ #include "codehead.h"
+ #include "mode.hpp"
+--- common/video/iso-mpeg4/src/sys_encoder_mbinterlace.cpp
++++ common/video/iso-mpeg4/src/sys_encoder_mbinterlace.cpp
+@@ -60,7 +60,7 @@
+ #include <stdio.h>
+ #include <math.h>
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+
+ #include "typeapi.h"
+ #include "codehead.h"
+--- common/video/iso-mpeg4/src/sys_encoder_mcenc.cpp
++++ common/video/iso-mpeg4/src/sys_encoder_mcenc.cpp
+@@ -53,7 +53,7 @@
+ #include <stdio.h>
+ #include <math.h>
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+
+ #include "typeapi.h"
+ #include "codehead.h"
+--- common/video/iso-mpeg4/src/sys_encoder_motest.cpp
++++ common/video/iso-mpeg4/src/sys_encoder_motest.cpp
+@@ -67,7 +67,7 @@
+ #include <stdio.h>
+ #include <math.h>
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+
+ #include "typeapi.h"
+ #include "codehead.h"
+--- common/video/iso-mpeg4/src/sys_encoder_mvenc.cpp
++++ common/video/iso-mpeg4/src/sys_encoder_mvenc.cpp
+@@ -44,7 +44,7 @@
+
+ **************************************************************************/
+ #include <stdio.h>
+-#include <fstream.h>
++#include <fstream>
+ #include <math.h>
+ #include <stdlib.h>
+
+--- common/video/iso-mpeg4/src/sys_encoder_padenc.cpp
++++ common/video/iso-mpeg4/src/sys_encoder_padenc.cpp
+@@ -43,7 +43,7 @@
+ #include <stdio.h>
+ #include <math.h>
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+
+ #include "typeapi.h"
+ #include "codehead.h"
+--- common/video/iso-mpeg4/src/sys_encoder_sesenc.cpp
++++ common/video/iso-mpeg4/src/sys_encoder_sesenc.cpp
+@@ -83,8 +83,8 @@
+ #include "stdlib.h"
+ #include "stdio.h"
+ #include "math.h"
+-#include "fstream.h"
+-#include "ostream.h"
++#include "fstream"
++#include "ostream"
+
+ #include "typeapi.h"
+ #include "codehead.h"
+--- common/video/iso-mpeg4/src/sys_encoder_sptenc.cpp
++++ common/video/iso-mpeg4/src/sys_encoder_sptenc.cpp
+@@ -40,7 +40,7 @@
+ *************************************************************************/
+
+ #include <stdio.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <math.h>
+ #include <stdlib.h>
+
+--- common/video/iso-mpeg4/src/sys_encoder_tm5rc.cpp
++++ common/video/iso-mpeg4/src/sys_encoder_tm5rc.cpp
+@@ -52,7 +52,7 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <math.h>
+ #include "header.h"
+ #include "typeapi.h"
+--- common/video/iso-mpeg4/src/sys_encoder_vopmbenc.cpp
++++ common/video/iso-mpeg4/src/sys_encoder_vopmbenc.cpp
+@@ -73,7 +73,7 @@
+ #include <stdio.h>
+ #include <math.h>
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+
+ #include "typeapi.h"
+ #include "codehead.h"
+--- common/video/iso-mpeg4/src/sys_error.cpp
++++ common/video/iso-mpeg4/src/sys_error.cpp
+@@ -35,7 +35,7 @@
+ #include <stdio.h>
+ #include <math.h>
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+
+ #include "typeapi.h"
+ #include "codehead.h"
+--- common/video/iso-mpeg4/src/sys_mode.cpp
++++ common/video/iso-mpeg4/src/sys_mode.cpp
+@@ -50,7 +50,7 @@
+
|
| @@ -1,109 +0,0 @@
-Name: mpeg4ip
-Version: 1.5.0.1
-Release: 4
-Summary: Set of linux video stream processing utilities
-License: MPL
-Group: Video
-Url: http://www.mpeg4ip.net
-Source: http://dl.sourceforge.net/sourceforge/mpeg4ip/%name-%version.tar.gz
-Patch0: mpeg4ip-1.3_configure.patch
-Patch1: mpeg4ip-1.4.1-gcc41.patch
-Patch2: mpeg4ip-1.4.1-x264r48.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: gcc-c++ id3lib-devel nasm pkgconfig SDL-devel mad-devel a52dec libmpeg2 libmpeg2-devel xvid-devel lame libx264-devel >= 0.0svn20060728 esound-devel libvorbis-devel glib2-devel gtk2-devel
-%if %suse_version < 1000
-BuildRequires: slang-devel
-%endif
-
-%if %suse_version < 1000 && %suse_version > 910
-BuildRequires: xorg-x11-devel
-%endif
-
-%if %suse_version <= 910
-BuildRequires: XFree86-libs XFree86-devel
-%endif
-
-%description
-The MPEG4IP project provides a standarts-based system
-for encoding, streaming and playing encoded auido and video.
-This package contains libraries of the MPEG4IP project.
-
-%package -n libmp4v2
-Group: System/Libraries
-Summary: MPEG4v2 library
-
-%description -n libmp4v2
-MPEG4v2 library
-
-%package -n libmp4v2-devel
-Group: System/Libraries
-Summary: Files needed for development with libmp4v2
-Requires: libmp4v2 = %{version} SDL-devel
-
-%description -n libmp4v2-devel
-Files needed for development with libmp4v2
-
-%prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2
-
-
-%build
-CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" ./bootstrap \
- --prefix=%_prefix \
- --libdir=%_libdir \
- --mandir=%_mandir \
- --disable-player
-
-make
-
-%install
-make DESTDIR="%{buildroot}" install
-
-%files
-%defattr(-, root, root)
-# utilitys
-%_bindir/mp4creator
-%_bindir/mp4info
-%_bindir/mp4dump
-%_bindir/mp4trackdump
-%_bindir/mp4tags
-%_bindir/mp4art
-%_bindir/mp4videoinfo
-# encoding tools
-%_bindir/lboxcrop
-%_bindir/rgb2yuv
-%_bindir/avi2raw
-# debugging tools
-%_bindir/avidump
-%_bindir/mpeg4vol
-%_bindir/mpeg2video_parse
-%_bindir/h264_parse
-# unknown
-%_bindir/mp4extract
-%_bindir/mpeg_ps_extract
-%_bindir/mpeg_ps_info
-# server
-%_bindir/mp4live
-%_mandir/man1/
-
-%files -n libmp4v2
-%defattr(-, root, root)
-%_libdir/*.so.*
-
-%files -n libmp4v2-devel
-%defattr(-, root, root)
-%_mandir/man3/*
-%_mandir/manm/*
-%_libdir/*.la
-%_bindir/mpeg4ip-config
-%_libdir/*.so
-%_includedir/*
-%_libdir/*.a
-
-%changelog
-* Sun Sep 30 2007 Carsten Schoene <cs@linux-administrator.com>
-- import for SLE_10 build
-
|
