|
[-]
[+]
|
Changed |
mpeg4ip.spec
|
|
|
|
[-]
[+]
|
Deleted |
mpeg4ip-1.3_configure.patch
^
|
| @@ -1,31 +0,0 @@
---- mpeg4ip-1.5.0.1/configure.orig 2006-06-08 21:17:51.000000000 +0200
-+++ mpeg4ip-1.5.0.1/configure 2008-12-19 00:16:46.000000000 +0100
-@@ -27061,8 +27061,8 @@
- if test x$have_ffmpeg_arg = xtrue; then
- { echo "$as_me:$LINENO: have enable ffmpeg $enable_ffmpeg" >&5
- echo "$as_me: have enable ffmpeg $enable_ffmpeg" >&6;}
-- FFMPEG_INC=-I${enable_ffmpeg}/libavcodec
-- FFMPEG_LIB="${enable_ffmpeg}/libavcodec/libavcodec.a -lz"
-+ FFMPEG_INC=-I${enable_ffmpeg}
-+ FFMPEG_LIB="-L$libdir -lavcodec -lz"
- saveCFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $FFMPEG_INC"
- echo "$as_me:$LINENO: checking for AVRational" >&5
-@@ -28881,7 +28881,7 @@
- if test x$USENASM = xtrue; then
- echo "$as_me:$LINENO: checking nasm version..." >&5
- echo $ECHO_N "checking nasm version...... $ECHO_C" >&6
-- BILLSNASM_arg=`nasm -r | tr '.' ' '`
-+ BILLSNASM_arg=`nasm -v | tr '.' ' '`
- BILLSNASM_ret=`util/testnasm.sh $BILLSNASM_arg`
- if test x$BILLSNASM_ret = x"yes"; then
- USENASM=true
-@@ -30666,7 +30666,7 @@
-
-
-
--PLAYER_PLUGIN_DIR=$libdir/mp4player_plugin
-+PLAYER_PLUGIN_DIR=$libdir/mp4player
-
-
- SDL_CFLAGS=`sdl-config --cflags`
|
|
[-]
[+]
|
Deleted |
mpeg4ip-1.4.1-gcc41.patch
^
|
| @@ -1,622 +0,0 @@
---- mpeg4ip-1.4.1/common/video/iso-mpeg4/src/sys_decoder_vopsedec.cpp
-+++ mpeg4ip-1.4.1/common/video/iso-mpeg4/src/sys_decoder_vopsedec.cpp
-@@ -2813,9 +2813,11 @@
- else
- write420_jnt_withMask(pfYUV, currY, currU, currV, currBY, currBUV, width, height);
- //~OBSSFIX_MODE3
-- fwrite(currBY, sizeof (PixelC), width*height, pfSeg);
-+ int ret;
-+ ret = fwrite(currBY, sizeof (PixelC), width*height, pfSeg);
-+ if (1 && ret < 1)
-+ perror("fwrite");
- #endif
--
- delete currY;
- delete currU;
- delete currV;
---- mpeg4ip-1.4.1/common/video/iso-mpeg4/src/sys_tps_bfshape.cpp
-+++ mpeg4ip-1.4.1/common/video/iso-mpeg4/src/sys_tps_bfshape.cpp
-@@ -132,6 +132,7 @@
-
- Void write420_sep(Int num, char *name, PixelC* destY, PixelC* destU, PixelC* destV, Int width, Int height) // modified by Sharp (98/10/26)
- {
-+ int ret;
- #ifdef __OUT_ONE_FRAME_
- char file[100];
- #endif
-@@ -143,23 +144,37 @@
- sprintf(file, "%s%d", name ,num);
- fp = fopen(file, "wb");
- #endif
-- fwrite(destY, sizeof (PixelC), width*height, fp);
-- fwrite(destU, sizeof (PixelC), width*height/4, fp);
-- fwrite(destV, sizeof (PixelC), width*height/4, fp);
-+ ret = fwrite(destY, sizeof (PixelC), width*height, fp);
-+ if (1 && ret < 1)
-+ perror("fwrite");
-+ ret = fwrite(destU, sizeof (PixelC), width*height/4, fp);
-+ if (1 && ret < 1)
-+ perror("fwrite");
-+ ret = fwrite(destV, sizeof (PixelC), width*height/4, fp);
-+ if (1 && ret < 1)
-+ perror("fwrite");
- fclose(fp);
- }
-
- // begin: added by Sharp (98/10/26)
- Void write420_jnt(FILE *fp, PixelC* destY, PixelC* destU, PixelC* destV, Int width, Int height)
- {
-- fwrite(destY, sizeof (PixelC), width*height, fp);
-- fwrite(destU, sizeof (PixelC), width*height/4, fp);
-- fwrite(destV, sizeof (PixelC), width*height/4, fp);
-+ int ret;
-+ ret = fwrite(destY, sizeof (PixelC), width*height, fp);
-+ if (1 && ret < 1)
-+ perror("fwrite");
-+ ret = fwrite(destU, sizeof (PixelC), width*height/4, fp);
-+ if (1 && ret < 1)
-+ perror("fwrite");
-+ ret = fwrite(destV, sizeof (PixelC), width*height/4, fp);
-+ if (1 && ret < 1)
-+ perror("fwrite");
- }
- // end: added by Sharp (98/10/26)
- //OBSSFIX_MODE3
- Void write420_jnt_withMask(FILE *fp, PixelC* destY, PixelC* destU, PixelC* destV, PixelC* destBY, PixelC* destBUV, Int width, Int height)
- {
-+ int ret;
- unsigned char pxlZeroY = 0 ;
- unsigned char pxlZeroUV = 128;
- unsigned char* destBUV_tmp = destBUV;
-@@ -167,24 +182,54 @@
-
- for (i=0; i < height; i++){
- for (j=0; j < width; j++){
-- if ( *destBY == MPEG4_OPAQUE) fwrite(destY, sizeof (unsigned char), 1, fp);
-- else fwrite(&pxlZeroY, sizeof (unsigned char), 1, fp);
-+ if ( *destBY == MPEG4_OPAQUE)
-+ {
-+ ret = fwrite(destY, sizeof (unsigned char), 1, fp);
-+ if (1 && ret < 1)
-+ perror("fwrite");
-+ }
-+ else
-+ {
-+ ret = fwrite(&pxlZeroY, sizeof (unsigned char), 1, fp);
-+ if (1 && ret < 1)
-+ perror("fwrite");
-+ }
- destY++;
- destBY++;
- }
- }
- for (i=0; i < height/2; i++){
- for (j=0; j < width/2; j++){
-- if ( *destBUV == MPEG4_OPAQUE)fwrite(destU, sizeof (unsigned char), 1, fp);
-- else fwrite(&pxlZeroUV, sizeof (unsigned char), 1, fp);
-+ if ( *destBUV == MPEG4_OPAQUE)
-+ {
-+ ret = fwrite(destU, sizeof (unsigned char), 1, fp);
-+ if (1 && ret < 1)
-+ perror("fwrite");
-+ }
-+ else
-+ {
-+ ret = fwrite(&pxlZeroUV, sizeof (unsigned char), 1, fp);
-+ if (1 && ret < 1)
-+ perror("fwrite");
-+ }
- destU++;
- destBUV++;
- }
- }
- for (i=0; i < height/2; i++){
- for (j=0; j < width/2; j++){
-- if ( *destBUV_tmp == MPEG4_OPAQUE)fwrite(destV, sizeof (unsigned char), 1, fp);
-- else fwrite(&pxlZeroUV, sizeof (unsigned char), 1, fp);
-+ if ( *destBUV_tmp == MPEG4_OPAQUE)
-+ {
-+ ret = fwrite(destV, sizeof (unsigned char), 1, fp);
-+ if (1 && ret < 1)
-+ perror("fwrite");
-+ }
-+ else
-+ {
-+ ret = fwrite(&pxlZeroUV, sizeof (unsigned char), 1, fp);
-+ if (1 && ret < 1)
-+ perror("fwrite");
-+ }
- destV++;
- destBUV_tmp++;
- }
-@@ -193,12 +238,15 @@
- //~OBSSFIX_MODE3
- Void write_seg_test(Int num, char *name, PixelC* destY, Int width, Int height)
- {
-+ int ret;
- char file[100];
- FILE *fp;
-
- sprintf(file, "%s%d", name ,num);
- fp = fopen(file, "a");
-- fwrite(destY, sizeof (PixelC), width*height, fp);
-+ ret = fwrite(destY, sizeof (PixelC), width*height, fp);
-+ if (1 && ret < 1)
-+ perror("fwrite");
- fclose(fp);
- }
-
---- mpeg4ip-1.4.1/common/video/iso-mpeg4/src/sys_vopses.cpp
-+++ mpeg4ip-1.4.1/common/video/iso-mpeg4/src/sys_vopses.cpp
-@@ -1153,18 +1153,23 @@
- // black frame
- Int iW = rct.width;
- Int iH = rct.height();
-- Int i;
-+ Int i, ret;
-+ ret = 0;
-
- PixelC *ppxlcPix = new PixelC [iW];
-
- pxlcmemset(ppxlcPix, 0, iW);
- for(i=0; i<iH; i++) // Y
-- fwrite(ppxlcPix, sizeof(PixelC), iW, pfYUV);
-+ ret = fwrite(ppxlcPix, sizeof(PixelC), iW, pfYUV);
-+ if (1 && ret < 1)
-+ perror("fwrite");
-
- if(pfSeg!=NULL)
- {
- for(i=0; i<iH; i++) // A
-- fwrite(ppxlcPix, sizeof(PixelC), iW, pfSeg);
-+ ret = fwrite(ppxlcPix, sizeof(PixelC), iW, pfSeg);
-+ if (1 && ret < 1)
-+ perror("fwrite");
- }
- if(ppfAux!=NULL)
- {
-@@ -1173,14 +1178,18 @@
- if(ppfAux[iAux]!=NULL)
- {
- for(i=0; i<iH; i++)
-- fwrite(ppxlcPix, sizeof(PixelC), iW, ppfAux[iAux]);
-+ ret = fwrite(ppxlcPix, sizeof(PixelC), iW, ppfAux[iAux]);
-+ if (1 && ret < 1)
-+ perror("fwrite");
- }
- }
-
- PixelC pxlcValUV = 1<<(nBits-1);
- pxlcmemset(ppxlcPix, pxlcValUV, iW>>1);
- for(i=0; i<iH; i++) // UV
-- fwrite(ppxlcPix, sizeof(PixelC), iW>>1, pfYUV);
-+ ret = fwrite(ppxlcPix, sizeof(PixelC), iW>>1, pfYUV);
-+ if (1 && ret < 1)
-+ perror("fwrite");
-
- delete ppxlcPix;
- }
---- mpeg4ip-1.4.1/common/video/iso-mpeg4/src/type_grayc.cpp
|
|
[-]
[+]
|
Deleted |
mpeg4ip-1.4.1-x264r48.patch
^
|
| @@ -1,19 +0,0 @@
---- server/mp4live/video_x264.cpp
-+++ server/mp4live/video_x264.cpp
-@@ -168,7 +168,16 @@
- m_param.i_bframe = 0;
- //debug_message("h264 b frames %d", m_param.i_bframe);
- m_param.rc.i_bitrate = Profile()->GetIntegerValue(CFG_VIDEO_BIT_RATE);
-+#if X264_BUILD < 48
- m_param.rc.b_cbr = Profile()->GetBoolValue(CFG_X264_USE_CBR) ? 1 : 0;
-+#else
-+ if (Profile()->GetBoolValue(CFG_X264_USE_CBR))
-+ {
-+ /* x264 r48 api doesn't have b_cbr anymore */
-+ m_param.rc.i_rc_method = X264_RC_CQP;
-+ m_param.rc.i_qp_constant = 0;
-+ }
-+#endif
- m_param.rc.f_rate_tolerance = Profile()->GetFloatValue(CFG_X264_BIT_RATE_TOLERANCE);
- if (Profile()->GetBoolValue(CFG_X264_USE_VBV)) {
- if (Profile()->GetBoolValue(CFG_X264_FORCE_BASELINE)) {
|
|
[-]
[+]
|
Deleted |
mpeg4ip-1.5.0.1-gcc42.patch
^
|
| @@ -1,18 +0,0 @@
---- mpeg4ip-1.5.0.1/common/video/iso-mpeg4/src/type_basic.cpp.orig 2005-05-04 21:56:00.000000000 +0200
-+++ mpeg4ip-1.5.0.1/common/video/iso-mpeg4/src/type_basic.cpp 2007-08-03 16:32:14.000000000 +0200
-@@ -317,13 +317,13 @@
- iHalfY = m_vctTrueHalfPel.y - iMVY * 2;
- }
-
--Void CMotionVector::setToZero (Void)
-+Void CMotionVector::setToZero ()
- {
- memset (this, 0, sizeof (*this));
- }
-
- // RRV insertion
--Void CMotionVector::scaleup (Void)
-+Void CMotionVector::scaleup ()
- {
- if(m_vctTrueHalfPel.x == 0){
- m_vctTrueHalfPel_x2.x = 0;
|
|
[-]
[+]
|
Deleted |
mpeg4ip-1.5.0.1-gcc43.patch
^
|
| @@ -1,313 +0,0 @@
---- 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 @@
-
|
|
[-]
[+]
|
Added |
mpeg4ip-ac.patch
^
|
| @@ -0,0 +1,10 @@
+--- mpeg4ip-1.5.0.1/lib/SDLAudio/configure.in.orig 2005-01-13 18:21:29.000000000 +0000
++++ mpeg4ip-1.5.0.1/lib/SDLAudio/configure.in 2006-12-13 09:36:00.879118000 +0000
+@@ -47,6 +47,7 @@
+
+ AC_LIBTOOL_WIN32_DLL
+ AM_PROG_LIBTOOL
++AM_PROG_AS
+ AC_PROG_MAKE_SET
+ AC_PROG_CC
+ AC_C_INLINE
|
|
[-]
[+]
|
Added |
mpeg4ip-ambiguous.patch.bz2
^
|
| @@ -0,0 +1,4193 @@
+diff -ur mpeg4ip-1.6.1.orig/common/video/iso-mpeg4/configure mpeg4ip-1.6.1/common/video/iso-mpeg4/configure
+--- mpeg4ip-1.6.1.orig/common/video/iso-mpeg4/configure 2007-10-08 17:10:48.000000000 +0200
++++ mpeg4ip-1.6.1/common/video/iso-mpeg4/configure 2009-09-19 02:43:14.000000000 +0200
+@@ -23951,7 +23951,7 @@
+ { echo "$as_me:$LINENO: compiler warnings will not be errors" >&5
+ echo "$as_me: compiler warnings will not be errors" >&6;}
+ else
+- BASE_ERR="$BASE_ERR -Werror"
++ BASE_ERR="$BASE_ERR"
+ { echo "$as_me:$LINENO: enabling compiler warnings as errors" >&5
+ echo "$as_me: enabling compiler warnings as errors" >&6;}
+ fi
+@@ -23979,8 +23979,8 @@
+
+ save_CFLAG="$CFLAGS"
+ save_CXXFLAG="$CXXFLAGS"
+-CFLAGS="$CFLAGS -Werror $temp_val"
+-CXXFLAGS="$CXXFLAGS -Werror $temp_val"
++CFLAGS="$CFLAGS $temp_val"
++CXXFLAGS="$CXXFLAGS $temp_val"
+ { echo "$as_me:$LINENO: checking whether c compiler accepts $temp_val" >&5
+ echo $ECHO_N "checking whether c compiler accepts $temp_val... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -24037,8 +24037,8 @@
+
+ save_CFLAG="$CFLAGS"
+ save_CXXFLAG="$CXXFLAGS"
+-CFLAGS="$CFLAGS -Werror $temp_val"
+-CXXFLAGS="$CXXFLAGS -Werror $temp_val"
++CFLAGS="$CFLAGS $temp_val"
++CXXFLAGS="$CXXFLAGS $temp_val"
+ { echo "$as_me:$LINENO: checking whether c compiler accepts $temp_val" >&5
+ echo $ECHO_N "checking whether c compiler accepts $temp_val... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -24122,8 +24122,8 @@
+
+ save_CFLAG="$CFLAGS"
+ save_CXXFLAG="$CXXFLAGS"
+-CFLAGS="$CFLAGS -Werror $temp_val"
+-CXXFLAGS="$CXXFLAGS -Werror $temp_val"
++CFLAGS="$CFLAGS $temp_val"
++CXXFLAGS="$CXXFLAGS $temp_val"
+ { echo "$as_me:$LINENO: checking whether c compiler accepts $temp_val" >&5
+ echo $ECHO_N "checking whether c compiler accepts $temp_val... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -24180,8 +24180,8 @@
+
+ save_CFLAG="$CFLAGS"
+ save_CXXFLAG="$CXXFLAGS"
+-CFLAGS="$CFLAGS -Werror $temp_val"
+-CXXFLAGS="$CXXFLAGS -Werror $temp_val"
++CFLAGS="$CFLAGS $temp_val"
++CXXFLAGS="$CXXFLAGS $temp_val"
+ { echo "$as_me:$LINENO: checking whether c compiler accepts $temp_val" >&5
+ echo $ECHO_N "checking whether c compiler accepts $temp_val... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -24265,8 +24265,8 @@
+
+ save_CFLAG="$CFLAGS"
+ save_CXXFLAG="$CXXFLAGS"
+-CFLAGS="$CFLAGS -Werror $temp_val"
+-CXXFLAGS="$CXXFLAGS -Werror $temp_val"
++CFLAGS="$CFLAGS $temp_val"
++CXXFLAGS="$CXXFLAGS $temp_val"
+ { echo "$as_me:$LINENO: checking whether c compiler accepts $temp_val" >&5
+ echo $ECHO_N "checking whether c compiler accepts $temp_val... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -24323,8 +24323,8 @@
+
+ save_CFLAG="$CFLAGS"
+ save_CXXFLAG="$CXXFLAGS"
+-CFLAGS="$CFLAGS -Werror $temp_val"
+-CXXFLAGS="$CXXFLAGS -Werror $temp_val"
++CFLAGS="$CFLAGS $temp_val"
++CXXFLAGS="$CXXFLAGS $temp_val"
+ { echo "$as_me:$LINENO: checking whether c compiler accepts $temp_val" >&5
+ echo $ECHO_N "checking whether c compiler accepts $temp_val... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -24398,8 +24398,8 @@
+
+ save_CFLAG="$CFLAGS"
+ save_CXXFLAG="$CXXFLAGS"
+-CFLAGS="$CFLAGS -Werror -Wmissing-prototypes"
+-CXXFLAGS="$CXXFLAGS -Werror -Wmissing-prototypes"
++CFLAGS="$CFLAGS -Wmissing-prototypes"
++CXXFLAGS="$CXXFLAGS -Wmissing-prototypes"
+ { echo "$as_me:$LINENO: checking whether c compiler accepts -Wmissing-prototypes" >&5
+ echo $ECHO_N "checking whether c compiler accepts -Wmissing-prototypes... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -24446,8 +24446,8 @@
+
+ save_CFLAG="$CFLAGS"
+ save_CXXFLAG="$CXXFLAGS"
+-CFLAGS="$CFLAGS -Werror -Wmissing-declarations"
+-CXXFLAGS="$CXXFLAGS -Werror -Wmissing-declarations"
++CFLAGS="$CFLAGS -Wmissing-declarations"
++CXXFLAGS="$CXXFLAGS -Wmissing-declarations"
+ { echo "$as_me:$LINENO: checking whether c compiler accepts -Wmissing-declarations" >&5
+ echo $ECHO_N "checking whether c compiler accepts -Wmissing-declarations... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -24494,8 +24494,8 @@
+
+ save_CFLAG="$CFLAGS"
+ save_CXXFLAG="$CXXFLAGS"
+-CFLAGS="$CFLAGS -Werror -Wno-char-subscripts"
+-CXXFLAGS="$CXXFLAGS -Werror -Wno-char-subscripts"
++CFLAGS="$CFLAGS -Wno-char-subscripts"
++CXXFLAGS="$CXXFLAGS -Wno-char-subscripts"
+ { echo "$as_me:$LINENO: checking whether c compiler accepts -Wno-char-subscripts" >&5
+ echo $ECHO_N "checking whether c compiler accepts -Wno-char-subscripts... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -24542,8 +24542,8 @@
+
+ save_CFLAG="$CFLAGS"
+ save_CXXFLAG="$CXXFLAGS"
+-CFLAGS="$CFLAGS -Werror -Wno-unknown-pragmas"
+-CXXFLAGS="$CXXFLAGS -Werror -Wno-unknown-pragmas"
++CFLAGS="$CFLAGS -Wno-unknown-pragmas"
++CXXFLAGS="$CXXFLAGS -Wno-unknown-pragmas"
+ { echo "$as_me:$LINENO: checking whether c compiler accepts -Wno-unknown-pragmas" >&5
+ echo $ECHO_N "checking whether c compiler accepts -Wno-unknown-pragmas... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -24590,8 +24590,8 @@
+
+ save_CFLAG="$CFLAGS"
+ save_CXXFLAG="$CXXFLAGS"
+-CFLAGS="$CFLAGS -Werror -Wformat=2"
+-CXXFLAGS="$CXXFLAGS -Werror -Wformat=2"
++CFLAGS="$CFLAGS -Wformat=2"
++CXXFLAGS="$CXXFLAGS -Wformat=2"
+ { echo "$as_me:$LINENO: checking whether c compiler accepts -Wformat=2" >&5
+ echo $ECHO_N "checking whether c compiler accepts -Wformat=2... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -24645,8 +24645,8 @@
+
+ save_CFLAG="$CFLAGS"
+ save_CXXFLAG="$CXXFLAGS"
+-CFLAGS="$CFLAGS -Werror -Wmissing-prototypes"
+-CXXFLAGS="$CXXFLAGS -Werror -Wmissing-prototypes"
++CFLAGS="$CFLAGS -Wmissing-prototypes"
++CXXFLAGS="$CXXFLAGS -Wmissing-prototypes"
+ { echo "$as_me:$LINENO: checking whether c++ compiler accepts -Wmissing-prototypes" >&5
+ echo $ECHO_N "checking whether c++ compiler accepts -Wmissing-prototypes... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -24693,8 +24693,8 @@
+
+ save_CFLAG="$CFLAGS"
+ save_CXXFLAG="$CXXFLAGS"
+-CFLAGS="$CFLAGS -Werror -Wno-char-subscripts"
+-CXXFLAGS="$CXXFLAGS -Werror -Wno-char-subscripts"
++CFLAGS="$CFLAGS -Wno-char-subscripts"
++CXXFLAGS="$CXXFLAGS -Wno-char-subscripts"
+ { echo "$as_me:$LINENO: checking whether c++ compiler accepts -Wno-char-subscripts" >&5
+ echo $ECHO_N "checking whether c++ compiler accepts -Wno-char-subscripts... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -24741,8 +24741,8 @@
+
+ save_CFLAG="$CFLAGS"
+ save_CXXFLAG="$CXXFLAGS"
+-CFLAGS="$CFLAGS -Werror -Woverloaded-virtual"
+-CXXFLAGS="$CXXFLAGS -Werror -Woverloaded-virtual"
++CFLAGS="$CFLAGS -Woverloaded-virtual"
++CXXFLAGS="$CXXFLAGS -Woverloaded-virtual"
+ { echo "$as_me:$LINENO: checking whether c++ compiler accepts -Woverloaded-virtual" >&5
+ echo $ECHO_N "checking whether c++ compiler accepts -Woverloaded-virtual... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -24789,8 +24789,8 @@
+
+ save_CFLAG="$CFLAGS"
+ save_CXXFLAG="$CXXFLAGS"
+-CFLAGS="$CFLAGS -Werror -Wno-unknown-pragmas"
+-CXXFLAGS="$CXXFLAGS -Werror -Wno-unknown-pragmas"
++CFLAGS="$CFLAGS -Wno-unknown-pragmas"
++CXXFLAGS="$CXXFLAGS -Wno-unknown-pragmas"
+ { echo "$as_me:$LINENO: checking whether c++ compiler accepts -Wno-unknown-pragmas" >&5
+ echo $ECHO_N "checking whether c++ compiler accepts -Wno-unknown-pragmas... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -24837,8 +24837,8 @@
+
+ save_CFLAG="$CFLAGS"
+ save_CXXFLAG="$CXXFLAGS"
+-CFLAGS="$CFLAGS -Werror -Wno-deprecated"
+-CXXFLAGS="$CXXFLAGS -Werror -Wno-deprecated"
++CFLAGS="$CFLAGS -Wno-deprecated"
++CXXFLAGS="$CXXFLAGS -Wno-deprecated"
+ { echo "$as_me:$LINENO: checking whether c++ compiler accepts -Wno-deprecated" >&5
+ echo $ECHO_N "checking whether c++ compiler accepts -Wno-deprecated... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -24885,8 +24885,8 @@
+
+ save_CFLAG="$CFLAGS"
+ save_CXXFLAG="$CXXFLAGS"
+-CFLAGS="$CFLAGS -Werror -Wformat=2"
+-CXXFLAGS="$CXXFLAGS -Werror -Wformat=2"
++CFLAGS="$CFLAGS -Wformat=2"
++CXXFLAGS="$CXXFLAGS -Wformat=2"
+ { echo "$as_me:$LINENO: checking whether c++ compiler accepts -Wformat=2" >&5
+ echo $ECHO_N "checking whether c++ compiler accepts -Wformat=2... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
|
|
[-]
[+]
|
Added |
mpeg4ip-audio_l16.cpp-typo.patch
^
|
| @@ -0,0 +1,11 @@
+--- mpeg4ip-1.6/server/mp4live/audio_l16.cpp.orig 2008-01-08 12:49:50.000000000 +0000
++++ mpeg4ip-1.6/server/mp4live/audio_l16.cpp 2008-01-08 12:50:05.000000000 +0000
+@@ -175,7 +175,7 @@
+ m_pFrameBuffer = (u_int16_t*)Malloc(m_frameBufferLength);
+
+ #ifdef WORDS_BIGENDIAN
+- memcpy(m_pFrameBuffer, pSameples, m_frameBufferLength);
++ memcpy(m_pFrameBuffer, pSamples, m_frameBufferLength);
+ #else
+ for (uint32_t ix = 0; ix < numSamplesPerChannel * m_audioDstChannels; ix++) {
+ m_pFrameBuffer[ix] = B2N_16(pSamples[ix]);
|
|
[-]
[+]
|
Added |
mpeg4ip-configure.patch
^
|
| @@ -0,0 +1,20 @@
+--- mpeg4ip-1.6/configure.in.orig 2007-11-04 09:32:41.958253000 +0100
++++ mpeg4ip-1.6/configure.in 2007-11-04 09:49:16.946954505 +0100
+@@ -8,7 +8,7 @@
+ AC_MSG_ERROR([Please run bootstrap first])
+ exit -1
+ fi
+-rm -f config.h >&/dev/null
++rm -f config.h 2>/dev/null
+ touch config.h
+ dnl Detect the canonical host and target build environment
+ AC_CANONICAL_HOST
+@@ -769,7 +769,7 @@
+
+ if test x$USENASM = xtrue; then
+ AC_MSG_CHECKING(nasm version...)
+- BILLSNASM_arg=`nasm -r | tr '.' ' '`
++ BILLSNASM_arg=`nasm -v | tr '.' ' '`
+ BILLSNASM_ret=`util/testnasm.sh $BILLSNASM_arg`
+ if test x$BILLSNASM_ret = x"yes"; then
+ USENASM=true
|
|
[-]
[+]
|
Added |
mpeg4ip-ffmpeg.patch
^
|
| @@ -0,0 +1,91 @@
+--- mpeg4ip-1.6.1/player/plugin/audio/ffmpeg/ffmpeg.h~ 2007-07-02 22:26:01.000000000 +0200
++++ mpeg4ip-1.6.1/player/plugin/audio/ffmpeg/ffmpeg.h 2008-08-26 17:07:24.000000000 +0200
+@@ -26,7 +26,7 @@
+ #include "codec_plugin.h"
+ extern "C" {
+ #ifdef HAVE_FFMPEG_INSTALLED
+-#include <ffmpeg/avcodec.h>
++#include <libavcodec/avcodec.h>
+ #else
+ #include <avcodec.h>
+ #endif
+--- mpeg4ip-1.6.1/server/mp4live/audio_ffmpeg.h~ 2007-07-02 22:26:04.000000000 +0200
++++ mpeg4ip-1.6.1/server/mp4live/audio_ffmpeg.h 2008-08-26 17:15:49.000000000 +0200
+@@ -25,7 +25,7 @@
+ #include "audio_encoder.h"
+ extern "C" {
+ #ifdef HAVE_FFMPEG_INSTALLED
+-#include <ffmpeg/avcodec.h>
++#include <libavcodec/avcodec.h>
+ #else
+ #include <avcodec.h>
+ #endif
+--- mpeg4ip-1.6.1/server/mp4live/video_ffmpeg.h~ 2007-07-02 22:26:05.000000000 +0200
++++ mpeg4ip-1.6.1/server/mp4live/video_ffmpeg.h 2008-08-26 17:16:07.000000000 +0200
+@@ -25,7 +25,7 @@
+ #include "video_encoder.h"
+ extern "C" {
+ #ifdef HAVE_FFMPEG_INSTALLED
+-#include <ffmpeg/avcodec.h>
++#include <libavcodec/avcodec.h>
+ #else
+ #include <avcodec.h>
+ #endif
+--- mpeg4ip-1.6.1/configure.in.orig 2008-08-26 17:02:49.000000000 +0200
++++ mpeg4ip-1.6.1/configure.in 2008-08-26 19:28:09.000000000 +0200
+@@ -487,7 +487,7 @@
+ if test x$have_ffmpeg_arg = xtrue; then
+ AC_MSG_NOTICE([have enable ffmpeg $enable_ffmpeg])
+ FFMPEG_INC=-I${enable_ffmpeg}/libavcodec
+- FFMPEG_LIB="${enable_ffmpeg}/libavcodec/libavcodec.a -lz"
++ FFMPEG_LIB="-lavcodec -lz"
+ saveCFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $FFMPEG_INC"
+ AC_CHECK_TYPES([AVRational], , , [#include <avcodec.h>])
+diff -burNp mpeg4ip-1.6.1/configure.in mpeg4ip-1.6.1-new/configure.in
+--- mpeg4ip-1.6.1/configure.in 2007-09-28 22:45:08.000000000 +0200
++++ mpeg4ip-1.6.1-new/configure.in 2008-10-10 22:09:56.469368599 +0200
+@@ -512,7 +512,7 @@ if test x$disable_ffmpeg = xfalse; then
+ if test x$have_ffmpeg = xtrue; then
+ AC_DEFINE(HAVE_FFMPEG_INSTALLED, 1, [defined if ffmpeg is installed])
+ FFMPEG_INC=
+- FFMPEG_LIB="-lavcodec -lz $ffmpeg_add_libs"
++ FFMPEG_LIB="-lavcodec -lz $ffmpeg_add_libs $(pkg-config libswscale --libs --silence-errors)"
+ AC_CHECK_TYPES([AVRational], , , [#include <ffmpeg/avcodec.h>])
+ AC_CHECK_MEMBERS(AVCodecContext.time_base, , , [#include <ffmpeg/avcodec.h>])
+ AC_CHECK_DECLS([avcodec_decode_audio2], , ,[#include <ffmpeg/avcodec.h>])
+--- mpeg4ip-1.6.1/player/plugin/video/ffmpeg/ffmpeg.h 2007-07-02 22:26:03.000000000 +0200
++++ mpeg4ip-1.6.1-new/player/plugin/video/ffmpeg/ffmpeg.h 2008-10-10 22:16:05.176622742 +0200
+@@ -27,7 +27,8 @@
+ #include "codec_plugin.h"
+ extern "C" {
+ #ifdef HAVE_FFMPEG_INSTALLED
+-#include <ffmpeg/avcodec.h>
++#include <libavcodec/avcodec.h>
++#include <libswscale/swscale.h>
+ #else
+ #include <avcodec.h>
+ #endif
+--- mpeg4ip-1.6.1/player/plugin/video/ffmpeg/ffmpeg.cpp 2007-07-02 22:26:03.000000000 +0200
++++ mpeg4ip-1.6.1-new/player/plugin/video/ffmpeg/ffmpeg.cpp 2008-10-10 23:01:19.519476374 +0200
+@@ -585,10 +585,16 @@ static int ffmpeg_decode (codec_data_t *
+ from.data[ix] = ffmpeg->m_picture->data[ix];
+ from.linesize[ix] = ffmpeg->m_picture->linesize[ix];
+ }
+-
+- img_convert(&to, PIX_FMT_YUV420P,
+- &from, ffmpeg->m_c->pix_fmt,
+- ffmpeg->m_c->width, ffmpeg->m_c->height);
++#ifdef HAVE_FFMPEG_INSTALLED
++ SwsContext *pSWSCtx;
++ pSWSCtx = sws_getContext(ffmpeg->m_c->width, ffmpeg->m_c->height,
++ ffmpeg->m_c->pix_fmt,
++ ffmpeg->m_c->width, ffmpeg->m_c->height,
++ PIX_FMT_YUV420P, SWS_BICUBIC, 0, 0, 0);
++ sws_scale(pSWSCtx, from.data, from.linesize, 0, ffmpeg->m_c->height,
++ to.data, to.linesize);
++ sws_freeContext(pSWSCtx);
++#endif
+ ffmpeg->m_vft->video_filled_buffer(ffmpeg->m_ifptr,
+ ffmpeg->have_cached_ts ?
+ ffmpeg->cached_ts : ts);
|
|
[-]
[+]
|
Added |
mpeg4ip-gcc4.patch
^
|
| @@ -0,0 +1,41 @@
+--- mpeg4ip-1.5.0.1/common/video/iso-mpeg4/include/basic.hpp.orig 2005-05-04 19:55:58.000000000 +0000
++++ mpeg4ip-1.5.0.1/common/video/iso-mpeg4/include/basic.hpp 2006-12-13 10:15:12.283713250 +0000
+@@ -89,12 +89,9 @@
+ #define transpPixel CPixel(0,0,0,0)
+ #define opaquePixel CPixel(255,255,255,255)
+
+-#ifndef max
+-#define max(a,b) (((a) > (b)) ? (a) : (b))
+-#endif
+-#ifndef min
+-#define min(a, b) (((a) < (b)) ? (a) : (b))
+-#endif
++static inline long min( long x, long y ) { return ( ( x < y ) ? x : y ); }
++static inline long max( long x, long y ) { return ( ( x > y ) ? x : y ); }
++
+ #define signOf(x) (((x) > 0) ? 1 : 0)
+ #define invSignOf(x) ((x) > 0 ? 0 : 1) // see p.22/H.263
+ #define sign(x) ((x) > 0 ? 1 : -1) // see p.22/H.263
+--- mpeg4ip-1.6/common/video/iso-mpeg4/src/type_basic.cpp.orig 2006-08-03 20:30:21.000000000 +0200
++++ mpeg4ip-1.6/common/video/iso-mpeg4/src/type_basic.cpp 2007-11-04 01:28:16.465905317 +0100
+@@ -317,7 +317,7 @@
+ iHalfY = m_vctTrueHalfPel.y - iMVY * 2;
+ }
+
+-Void CMotionVector::setToZero (Void)
++Void CMotionVector::setToZero ()
+ {
+ memset (this, 0, sizeof (*this));
+ }
+--- mpeg4ip-1.6.1/server/mp4live/video_util_resize.h.orig 2005-03-25 21:40:05.000000000 +0100
++++ mpeg4ip-1.6.1/server/mp4live/video_util_resize.h 2008-08-26 19:48:34.000000000 +0200
+@@ -90,7 +90,7 @@
+
+ void CopyYuv(const uint8_t *fY, const uint8_t *fU, const uint8_t *fV,
+ uint32_t fyStride, uint32_t fuStride, uint32_t fvStride,
+- uint8_t *tY, uint8_t *tU, uint8_t *fV,
+- uint32_t tyStride, uint32_t tvStride, uint32_t tvStride,
++ uint8_t *tY, uint8_t *tU, uint8_t *tV,
++ uint32_t tyStride, uint32_t tuStride, uint32_t tvStride,
+ uint32_t w, uint32_t h);
+ #endif
|
|
[-]
[+]
|
Added |
mpeg4ip-gcc44.patch
^
|
| @@ -0,0 +1,29 @@
+--- mpeg4ip-1.6.1/include/mpeg4ip.h~ 2006-08-07 21:27:00.000000000 +0300
++++ mpeg4ip-1.6.1/include/mpeg4ip.h 2009-08-25 19:16:50.675218747 +0300
+@@ -120,14 +120,6 @@
+ #endif
+ #include <sys/param.h>
+
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-char *strcasestr(const char *haystack, const char *needle);
+-#ifdef __cplusplus
+-}
+-#endif
+-
+ #define OPEN_RDWR O_RDWR
+ #define OPEN_CREAT O_CREAT
+ #define OPEN_RDONLY O_RDONLY
+--- mpeg4ip-1.6.1/player/src/media_utils.cpp~ 2007-03-29 21:52:19.000000000 +0300
++++ mpeg4ip-1.6.1/player/src/media_utils.cpp 2009-08-25 20:04:15.872642682 +0300
+@@ -605,7 +605,8 @@
+ int have_audio_driver,
+ control_callback_vft_t *cc_vft)
+ {
+- char *slash, *cm;
++ const char *slash;
++ char *cm;
+ uint64_t prog;
+ session_desc_t *sdp;
+
|
|
[-]
[+]
|
Added |
mpeg4ip-link.patch
^
|
| @@ -0,0 +1,213 @@
+--- mpeg4ip-1.3/lib/mp4av/Makefile.am.orig 2005-05-09 20:18:10.000000000 +0200
++++ mpeg4ip-1.3/lib/mp4av/Makefile.am 2005-05-22 12:45:37.068607424 +0200
+@@ -47,6 +47,10 @@
+ rfcisma.cpp \
+ rfch264.cpp
+
++libmp4av_la_LIBADD = $(top_builddir)/lib/mp4v2/libmp4v2.la
++
++$(top_builddir)/lib/mp4v2/libmp4v2.la:
++ $(MAKE) -C $(top_builddir)/lib/mp4v2 libmp4v2.la
+
+ EXTRA_DIST = libmp4av.dsp libmp4av_st.dsp
+
+--- mpeg4ip-1.0/lib/msg_queue/Makefile.am.orig 2004-02-10 08:14:36.000000000 +0100
++++ mpeg4ip-1.0/lib/msg_queue/Makefile.am 2004-02-10 08:55:26.209395440 +0100
+@@ -3,6 +3,7 @@
+ libmsg_queue_la_SOURCES = \
+ msg_queue.cpp \
+ msg_queue.h
++libmsg_queue_la_LIBADD = @SDL_LIBS@
+
+ EXTRA_DIST = \
+ libmsg_queue60.dsp
+--- mpeg4ip-1.2/configure.in.orig 2004-12-03 23:40:25.000000000 +0100
++++ mpeg4ip-1.2/configure.in 2004-12-04 19:27:00.086541416 +0100
+@@ -338,7 +338,7 @@
+ AC_CHECK_LIB(vorbis, vorbis_bitrate_init, [have_vorbis=true], [have_vorbis=false])
+ if test x$have_vorbis = xtrue; then
+ LIBVORBIS_LIB="-lvorbis -lvorbisenc"
+- AC_CHECK_HEADER([faad.h], [LIBVORBIS_LIB="$LIBVORBIS_LIB -lfaad"])
++dnl AC_CHECK_HEADER([faad.h], [LIBVORBIS_LIB="$LIBVORBIS_LIB -lfaad"]) -- not used now
+ fi
+ fi
+ AC_SUBST(LIBVORBIS_LIB)
+--- mpeg4ip-1.1/lib/SDLAudio/src/Makefile.am.orig 2004-05-12 23:15:24.000000000 +0200
++++ mpeg4ip-1.1/lib/SDLAudio/src/Makefile.am 2004-10-23 18:06:27.610465888 +0200
+@@ -23,7 +23,7 @@
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ libmpeg4ipSDL_la_LIBADD = \
+ @SDL_EXTRALIBS@ \
+- @SYSTEM_LIBS@
++ @SYSTEM_LIBS@ -lSDL
+ libmpeg4ipSDL_la_DEPENDENCIES = \
+ @SDL_EXTRALIBS@
+
+--- mpeg4ip-1.4.1/player/plugin/rtp/isma_audio/Makefile.am.orig 2005-09-08 19:58:24.000000000 +0200
++++ mpeg4ip-1.4.1/player/plugin/rtp/isma_audio/Makefile.am 2005-11-19 18:56:25.681346200 +0100
+@@ -15,13 +15,13 @@
+ isma_rtp_plugin_la_LIBADD = \
+ $(top_builddir)/lib/mp4av/libmp4av.la \
+ $(top_builddir)/player/lib/mp4util/libmp4util.la \
+- -lm
++ -lSDL -lm
+
+ isma_enc_rtp_plugin_la_LIBADD = \
+ $(top_builddir)/lib/mp4av/libmp4av.la \
+ $(top_builddir)/player/lib/mp4util/libmp4util.la \
+ $(top_builddir)/lib/ismacryp/libismacryp.la @SRTPLIB@ \
+- -lm
++ -lSDL -lm
+
+ INCLUDES = -I$(top_srcdir)/player/src \
+ -I$(top_srcdir)/player/lib \
+--- mpeg4ip-1.1/player/src/codec/wav/Makefile.am.orig 2004-02-24 19:46:48.000000000 +0100
++++ mpeg4ip-1.1/player/src/codec/wav/Makefile.am 2004-10-23 18:21:11.522090896 +0200
+@@ -5,6 +5,7 @@
+ ourwav.h \
+ wav_file.cpp \
+ wav_file.h
++wav_plugin_la_LIBADD = -lSDL
+
+ libdir = @PLAYER_PLUGIN_DIR@
+
+--- mpeg4ip-1.4.1/player/lib/audio/celp/dec/Makefile.am.orig 2005-08-12 19:17:17.000000000 +0200
++++ mpeg4ip-1.4.1/player/lib/audio/celp/dec/Makefile.am 2005-11-19 18:57:45.808165072 +0100
+@@ -43,6 +43,8 @@
+ phi_priv.c \
+ phi_xits.c
+
++libmpeg4ip_celp_la_LIBADD = $(top_builddir)/player/lib/audio/celp/BS/libmpeg4ip_celpbs.la -lm
++
+ INCLUDES=-I$(srcdir)/../include
+ AM_CFLAGS =
+
+--- mpeg4ip-1.3/player/lib/audio/faad/Makefile.am.orig 2005-05-04 22:01:36.000000000 +0200
++++ mpeg4ip-1.3/player/lib/audio/faad/Makefile.am 2005-05-22 12:48:37.708146040 +0200
+@@ -32,6 +32,7 @@
+ tns.h \
+ transfo.h\
+ util.h
++libmpeg4ip_faad_la_LIBADD = -lm
+ INCLUDES = -I$(top_srcdir)/include
+ AM_CFLAGS = -O2 -Werror -Wall -fexceptions -fno-strict-aliasing
+
+--- mpeg4ip-1.6/lib/srtp/Makefile.am.orig 2007-07-24 22:32:28.000000000 +0200
++++ mpeg4ip-1.6/lib/srtp/Makefile.am 2007-11-04 01:17:33.421260290 +0100
+@@ -9,15 +9,16 @@
+
+ libsrtpif_la_SOURCES = liblibsrtp.c \
+ liblibsrtp.h
++libsrtpif_la_LIBADD = @SRTPLIB@
+
+ #EXTRA_DIST = README README.html
+
+ check_PROGRAMS = test_srtp_client test_srtp_server
+
+ test_srtp_client_SOURCES = test_srtp_client.cpp
+-test_srtp_client_LDADD = ../rtp/libuclmmbase.la libsrtpif.la ../mp4v2/libmp4v2.la ../../../srtp/libsrtp.a
++test_srtp_client_LDADD = ../rtp/libuclmmbase.la libsrtpif.la ../mp4v2/libmp4v2.la
+
+ test_srtp_server_SOURCES = test_srtp_server.cpp
+-test_srtp_server_LDADD = ../rtp/libuclmmbase.la libsrtpif.la ../mp4v2/libmp4v2.la ../../../srtp/libsrtp.a
++test_srtp_server_LDADD = ../rtp/libuclmmbase.la libsrtpif.la ../mp4v2/libmp4v2.la
+
+ EXTRA_DIST=liblibstrp.vcproj
+--- mpeg4ip-1.5.0.1/lib/mpeg2ps/Makefile.am.orig 2005-09-28 20:38:27.000000000 +0000
++++ mpeg4ip-1.5.0.1/lib/mpeg2ps/Makefile.am 2006-12-13 10:18:40.852748000 +0000
+@@ -12,10 +12,10 @@
+
+ bin_PROGRAMS = mpeg_ps_info mpeg_ps_extract
+ prog_libadd = \
++ libmpeg2_program.la \
+ $(top_builddir)/lib/gnu/libmpeg4ip_gnu.la \
+ $(top_builddir)/lib/mp4av/libmp4av.la \
+- $(top_builddir)/lib/mp4v2/libmp4v2.la \
+- libmpeg2_program.la
++ $(top_builddir)/lib/mp4v2/libmp4v2.la
+
+ mpeg_ps_info_SOURCES = ps_info.cpp
+ mpeg_ps_info_LDADD = $(prog_libadd)
+@@ -27,8 +27,7 @@
+ mpeg2ps_test_LDADD = libmpeg2_program.la \
+ $(top_builddir)/lib/gnu/libmpeg4ip_gnu.la \
+ $(top_builddir)/lib/mp4av/libmp4av.la \
+- $(top_builddir)/lib/mp4v2/libmp4v2.la \
+- libmpeg2_program.la
++ $(top_builddir)/lib/mp4v2/libmp4v2.la
+
+ EXTRA_DIST=libmpeg2ps.dsp
+
+--- mpeg4ip-1.5.0.1/player/src/Makefile.am.orig 2006-12-13 11:11:12.927981500 +0000
++++ mpeg4ip-1.5.0.1/player/src/Makefile.am 2006-12-13 11:11:16.430448500 +0000
+@@ -196,13 +196,13 @@
+
+ mp4player_LDFLAGS = $(SDL_AUDIO_FLAGS)
+ mp4player_LDADD = \
+- -lm $(SDL_AUDIO_LIB) \
+ libmp4player.la \
+ libmp4syncbase.la \
+ libmp4syncsdl.la \
+ libmp4sdlvideo.la \
+ libmp4syncbase.la \
+ libmp4playerutils.la \
++ -lm $(SDL_AUDIO_LIB) \
+ $(top_builddir)/lib/audio/libaudio.la \
+ $(top_builddir)/lib/ismacryp/libismacryp.la \
+ $(top_builddir)/lib/srtp/libsrtpif.la \
+--- mpeg4ip-1.5.0.1/lib/ismacryp/Makefile.am.orig 2006-05-11 17:47:06.000000000 +0000
++++ mpeg4ip-1.5.0.1/lib/ismacryp/Makefile.am 2006-12-13 11:26:09.546762500 +0000
+@@ -5,6 +5,7 @@
+ libismacryp_la_SOURCES = ismacryplib.c \
+ ismacryplib.h \
+ ismacryplib_priv.h
++libismacryp_la_LIBADD = @SRTPLIB@
+
+ AM_CFLAGS = -D_REENTRANT @BILLS_CWARNINGS@
+
+--- mpeg4ip-1.5.0.1/server/mp4creator/Makefile.am.orig 2005-09-08 17:58:24.000000000 +0000
++++ mpeg4ip-1.5.0.1/server/mp4creator/Makefile.am 2006-12-13 11:27:33.087983500 +0000
+@@ -30,7 +30,6 @@
+ $(top_builddir)/lib/mp4av/libmp4av.la \
+ $(top_builddir)/lib/avi/libavi.la \
+ $(top_builddir)/lib/gnu/libmpeg4ip_gnu.la \
+- $(top_builddir)/lib/ismacryp/libismacryp.la \
+- @SRTPLIB@
++ $(top_builddir)/lib/ismacryp/libismacryp.la
+
+ EXTRA_DIST = mp4creator60.dsp
+--- mpeg4ip-1.5.0.1/server/mp4live/gui/Makefile.am.orig 2006-03-09 23:05:52.000000000 +0000
++++ mpeg4ip-1.5.0.1/server/mp4live/gui/Makefile.am 2006-12-13 11:59:40.356430250 +0000
+@@ -18,6 +18,8 @@
+ transmit_dialog.cpp \
+ video_dialog.cpp
+
++libmp4livegui_la_LIBADD = @GTK_LIBS@
++
+ INCLUDES=@GLIB_CFLAGS@ @GTK_CFLAGS@ \
+ -I$(top_srcdir)/server/mp4live \
+ -I$(top_srcdir)/include \
+--- mpeg4ip-1.6/server/mp4live/Makefile.am.orig 2007-01-26 20:50:00.000000000 +0100
++++ mpeg4ip-1.6/server/mp4live/Makefile.am 2007-11-04 09:24:55.331661796 +0100
+@@ -156,10 +156,6 @@
+ -D_REENTRANT -DNOCONTROLS -fexceptions @BILLS_CPPWARNINGS@
+
+ mp4live_LDADD = \
+- @GTK_LIBS@ @GLIB_LIBS@ \
+- @FAAC_LIB@ \
+- @LAME_LIB@ \
+- @TWOLAME_LIB@ \
|
|
|
Changed |
mpeg4ip-1.6.1.tar.bz2
^
|
