diff options
Diffstat (limited to 'src/libffmpeg/diff_to_ffmpeg_cvs.txt')
| -rw-r--r-- | src/libffmpeg/diff_to_ffmpeg_cvs.txt | 58 |
1 files changed, 42 insertions, 16 deletions
diff --git a/src/libffmpeg/diff_to_ffmpeg_cvs.txt b/src/libffmpeg/diff_to_ffmpeg_cvs.txt index 0f8d360c1..7a97c12a2 100644 --- a/src/libffmpeg/diff_to_ffmpeg_cvs.txt +++ b/src/libffmpeg/diff_to_ffmpeg_cvs.txt @@ -4,7 +4,7 @@ RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/avcodec.h,v retrieving revision 1.426 diff -u -r1.426 avcodec.h --- libavcodec/avcodec.h 20 Oct 2005 20:04:45 -0000 1.426 -+++ libavcodec/avcodec.h 23 Oct 2005 00:27:23 -0000 ++++ libavcodec/avcodec.h 23 Oct 2005 12:33:01 -0000 @@ -31,6 +31,13 @@ #define AV_TIME_BASE 1000000 #define AV_TIME_BASE_Q (AVRational){1, AV_TIME_BASE} @@ -39,7 +39,7 @@ RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/dsputil.c,v retrieving revision 1.125 diff -u -r1.125 dsputil.c --- libavcodec/dsputil.c 14 Aug 2005 15:42:39 -0000 1.125 -+++ libavcodec/dsputil.c 23 Oct 2005 00:27:39 -0000 ++++ libavcodec/dsputil.c 23 Oct 2005 12:33:20 -0000 @@ -371,6 +371,8 @@ assert(s>=0); @@ -55,7 +55,7 @@ RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/dsputil.h,v retrieving revision 1.120 diff -u -r1.120 dsputil.h --- libavcodec/dsputil.h 19 Sep 2005 23:26:47 -0000 1.120 -+++ libavcodec/dsputil.h 23 Oct 2005 00:27:41 -0000 ++++ libavcodec/dsputil.h 23 Oct 2005 12:33:24 -0000 @@ -31,6 +31,9 @@ #include "common.h" #include "avcodec.h" @@ -72,7 +72,7 @@ RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/motion_est.c,v retrieving revision 1.110 diff -u -r1.110 motion_est.c --- libavcodec/motion_est.c 26 Aug 2005 19:05:44 -0000 1.110 -+++ libavcodec/motion_est.c 23 Oct 2005 00:27:55 -0000 ++++ libavcodec/motion_est.c 23 Oct 2005 12:33:36 -0000 @@ -20,6 +20,9 @@ * * new Motion Estimation (X1/EPZS) by Michael Niedermayer <michaelni@gmx.at> @@ -95,7 +95,7 @@ RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mpeg12.c,v retrieving revision 1.242 diff -u -r1.242 mpeg12.c --- libavcodec/mpeg12.c 14 Aug 2005 15:42:39 -0000 1.242 -+++ libavcodec/mpeg12.c 23 Oct 2005 00:28:10 -0000 ++++ libavcodec/mpeg12.c 23 Oct 2005 12:34:08 -0000 @@ -34,6 +34,13 @@ //#include <assert.h> @@ -142,7 +142,7 @@ RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mpegvideo.c,v retrieving revision 1.488 diff -u -r1.488 mpegvideo.c --- libavcodec/mpegvideo.c 14 Aug 2005 15:42:40 -0000 1.488 -+++ libavcodec/mpegvideo.c 23 Oct 2005 00:28:41 -0000 ++++ libavcodec/mpegvideo.c 23 Oct 2005 12:35:02 -0000 @@ -38,6 +38,14 @@ //#undef NDEBUG //#include <assert.h> @@ -451,7 +451,7 @@ RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/snow.c,v retrieving revision 1.63 diff -u -r1.63 snow.c --- libavcodec/snow.c 21 Sep 2005 23:09:16 -0000 1.63 -+++ libavcodec/snow.c 23 Oct 2005 00:28:57 -0000 ++++ libavcodec/snow.c 23 Oct 2005 12:35:34 -0000 @@ -2037,6 +2037,7 @@ #define P_MV1 P[9] #define FLAG_QPEL 1 //must be 1 @@ -538,7 +538,7 @@ RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/utils.c,v retrieving revision 1.160 diff -u -r1.160 utils.c --- libavcodec/utils.c 20 Sep 2005 21:43:45 -0000 1.160 -+++ libavcodec/utils.c 23 Oct 2005 00:29:04 -0000 ++++ libavcodec/utils.c 23 Oct 2005 12:35:47 -0000 @@ -1241,11 +1241,11 @@ AVClass* avc= ptr ? *(AVClass**)ptr : NULL; if(level>av_log_level) @@ -559,7 +559,7 @@ RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/i386/dsputil_mmx.c,v retrieving revision 1.104 diff -u -r1.104 dsputil_mmx.c --- libavcodec/i386/dsputil_mmx.c 9 Oct 2005 23:38:52 -0000 1.104 -+++ libavcodec/i386/dsputil_mmx.c 23 Oct 2005 00:29:19 -0000 ++++ libavcodec/i386/dsputil_mmx.c 23 Oct 2005 12:36:21 -0000 @@ -617,31 +617,32 @@ } @@ -616,7 +616,7 @@ RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mlib/dsputil_mlib.c,v retrieving revision 1.15 diff -u -r1.15 dsputil_mlib.c --- libavcodec/mlib/dsputil_mlib.c 15 Mar 2004 01:21:01 -0000 1.15 -+++ libavcodec/mlib/dsputil_mlib.c 23 Oct 2005 00:29:21 -0000 ++++ libavcodec/mlib/dsputil_mlib.c 23 Oct 2005 12:36:24 -0000 @@ -20,6 +20,8 @@ #include "../dsputil.h" #include "../mpegvideo.h" @@ -659,38 +659,47 @@ RCS file: /cvsroot/ffmpeg/ffmpeg/libavutil/common.h,v retrieving revision 1.153 diff -u -r1.153 common.h --- libavutil/common.h 19 Sep 2005 23:26:47 -0000 1.153 -+++ libavutil/common.h 23 Oct 2005 00:29:24 -0000 -@@ -6,6 +6,11 @@ ++++ libavutil/common.h 23 Oct 2005 12:36:30 -0000 +@@ -6,6 +6,12 @@ #ifndef COMMON_H #define COMMON_H +/* xine: disable DEBUG for ffmpeg (too noisy) */ +#ifdef DEBUG +#undef DEBUG ++#define DISABLE_INLINE +#endif + #if defined(WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__) # define CONFIG_WIN32 #endif -@@ -186,7 +191,7 @@ +@@ -185,8 +191,10 @@ + #ifdef HAVE_AV_CONFIG_H ++#if 0 #ifdef USE_FASTMEMCPY -#include "fastmemcpy.h" + #define memcpy(to, from, len) xine_fast_memcpy(to, from, len) ++#endif #endif #include <float.h> -@@ -206,7 +211,7 @@ +@@ -205,10 +213,12 @@ + #ifdef HAVE_AV_CONFIG_H ++#if 0 # ifdef USE_FASTMEMCPY -# include "fastmemcpy.h" +# define memcpy(to, from, len) xine_fast_memcpy(to, from, len) # endif # endif /* HAVE_AV_CONFIG_H */ ++#endif + + #endif /* !CONFIG_WIN32 && !CONFIG_OS2 */ -@@ -235,7 +240,9 @@ +@@ -235,7 +245,9 @@ /* debug stuff */ # ifndef DEBUG @@ -700,7 +709,7 @@ diff -u -r1.153 common.h # endif # include <assert.h> -@@ -530,8 +537,8 @@ +@@ -530,8 +542,8 @@ #define sprintf sprintf_is_forbidden_due_to_security_issues_use_snprintf #define strcat strcat_is_forbidden_due_to_security_issues_use_pstrcat #if !(defined(LIBAVFORMAT_BUILD) || defined(_FRAMEHOOK_H)) @@ -711,3 +720,20 @@ diff -u -r1.153 common.h #endif #define CHECKED_ALLOCZ(p, size)\ +@@ -574,4 +586,16 @@ + + #endif /* HAVE_AV_CONFIG_H */ + ++/* xine: inline causes trouble for debug compiling */ ++#ifdef DISABLE_INLINE ++# ifdef inline ++# undef inline ++# endif ++# ifdef always_inline ++# undef always_inline ++# endif ++# define inline ++# define always_inline ++#endif ++ + #endif /* COMMON_H */ |