diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2006-07-08 12:34:52 +0000 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2006-07-08 12:34:52 +0000 |
| commit | d86c6e0b24eabbc96842f6b6134665754cfcc99f (patch) | |
| tree | 4e3adfdac6ba493b20e3508d3f408547baf40453 | |
| parent | fa4f850c33686eba30570796f77dfbf37acf2972 (diff) | |
| download | xine-lib-d86c6e0b24eabbc96842f6b6134665754cfcc99f.tar.gz xine-lib-d86c6e0b24eabbc96842f6b6134665754cfcc99f.tar.bz2 | |
Remove A few hunks that are now fixed in FFmpeg's SVN.
CVS patchset: 8095
CVS date: 2006/07/08 12:34:52
| -rw-r--r-- | src/libffmpeg/diff_to_ffmpeg_cvs.txt | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/src/libffmpeg/diff_to_ffmpeg_cvs.txt b/src/libffmpeg/diff_to_ffmpeg_cvs.txt index c2e1fe588..942471172 100644 --- a/src/libffmpeg/diff_to_ffmpeg_cvs.txt +++ b/src/libffmpeg/diff_to_ffmpeg_cvs.txt @@ -33,22 +33,6 @@ diff -u -r1.446 avcodec.h #ifdef __cplusplus } #endif -Index: libavcodec/dsputil.c -=================================================================== -RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/dsputil.c,v -retrieving revision 1.133 -diff -u -r1.133 dsputil.c ---- libavcodec/dsputil.c 5 Feb 2006 13:35:16 -0000 1.133 -+++ libavcodec/dsputil.c 5 Feb 2006 13:43:47 -0000 -@@ -371,6 +371,8 @@ - assert(s>=0); - - return s>>2; -+#else -+ return 0; - #endif - } - Index: libavcodec/dsputil.h =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/dsputil.h,v @@ -664,16 +648,6 @@ diff -u -r1.161 common.h #endif /* !CONFIG_WIN32 && !CONFIG_OS2 */ -@@ -275,7 +285,9 @@ - /* debug stuff */ - - # ifndef DEBUG -+# ifndef NDEBUG - # define NDEBUG -+# endif - # endif - # include <assert.h> - @@ -573,8 +585,8 @@ #define sprintf sprintf_is_forbidden_due_to_security_issues_use_snprintf #define strcat strcat_is_forbidden_due_to_security_issues_use_pstrcat @@ -702,23 +676,6 @@ diff -u -r1.161 common.h +#endif + #endif /* COMMON_H */ -Index: libavcodec/truemotion1.c -=================================================================== -RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/libavcodec/truemotion1.c,v -retrieving revision 1.8 -retrieving revision 1.9 -diff -u -p -r1.8 -r1.9 ---- libavcodec/truemotion1.c 5 Feb 2006 14:11:35 -0000 1.8 -+++ libavcodec/truemotion1.c 22 May 2006 16:57:36 -0000 1.9 -@@ -322,7 +322,7 @@ static void gen_vector_table24(TrueMotio - static int truemotion1_decode_header(TrueMotion1Context *s) - { - int i; -- struct frame_header header; -+ struct frame_header header = {0}; - uint8_t header_buffer[128]; /* logical maximum size of the header */ - const uint8_t *sel_vector_table; - Index: libavutil/common.h =================================================================== RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/libavutil/common.h,v |