diff options
| author | Matthias Hopf <mat@mshopf.de> | 2006-05-23 13:58:30 +0000 |
|---|---|---|
| committer | Matthias Hopf <mat@mshopf.de> | 2006-05-23 13:58:30 +0000 |
| commit | f403cfed004f9f88ebbc9cf8fc97101e729d9b18 (patch) | |
| tree | 3d5b1122b14f0d9317ee2ded7d4706ef5df86d61 /src | |
| parent | d2f17fd0d8a2fbb8f0cc363cb4e167e2a2c12012 (diff) | |
| download | xine-lib-f403cfed004f9f88ebbc9cf8fc97101e729d9b18.tar.gz xine-lib-f403cfed004f9f88ebbc9cf8fc97101e729d9b18.tar.bz2 | |
Add recent fixes.
CVS patchset: 7996
CVS date: 2006/05/23 13:58:30
Diffstat (limited to 'src')
| -rw-r--r-- | src/libffmpeg/diff_to_ffmpeg_cvs.txt | 36 |
1 files changed, 35 insertions, 1 deletions
diff --git a/src/libffmpeg/diff_to_ffmpeg_cvs.txt b/src/libffmpeg/diff_to_ffmpeg_cvs.txt index 3ab1779fe..c2e1fe588 100644 --- a/src/libffmpeg/diff_to_ffmpeg_cvs.txt +++ b/src/libffmpeg/diff_to_ffmpeg_cvs.txt @@ -1,4 +1,3 @@ -? diff_to_ffmpeg_cvs.txt Index: libavcodec/avcodec.h =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/avcodec.h,v @@ -703,3 +702,38 @@ 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 +retrieving revision 1.2 +retrieving revision 1.3 +diff -u -p -r1.2 -r1.3 +--- libavutil/common.h 23 Oct 2005 12:56:26 -0000 1.2 ++++ libavutil/common.h 22 May 2006 16:57:36 -0000 1.3 +@@ -539,7 +539,9 @@ tend= read_time();\ + #define time time_is_forbidden_due_to_security_issues + #define rand rand_is_forbidden_due_to_state_trashing + #define srand srand_is_forbidden_due_to_state_trashing ++#undef sprintf + #define sprintf sprintf_is_forbidden_due_to_security_issues_use_snprintf ++#undef strcat + #define strcat strcat_is_forbidden_due_to_security_issues_use_pstrcat + #if !(defined(LIBAVFORMAT_BUILD) || defined(_FRAMEHOOK_H)) + //#define printf please_use_av_log |