diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-12-06 18:11:53 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-12-06 18:11:53 +0000 |
| commit | e984f917fbbc37874f55c6aff3239831cb43d1ec (patch) | |
| tree | 79c7832e99ed11496e9b7a175bf810019213bc68 /src/libffmpeg | |
| parent | 1a94ed9db8e28082d9286df2d6c59c7dffb69c1e (diff) | |
| download | xine-lib-e984f917fbbc37874f55c6aff3239831cb43d1ec.tar.gz xine-lib-e984f917fbbc37874f55c6aff3239831cb43d1ec.tar.bz2 | |
reading through Daniel's huge patch was quite tiresome, but it was not worthless:
* fixing some lprintf's
* fixing one printf -> xprintf
* adding patch to diff_to_ffmpeg_cvs
* small addition to xineutils.h (some gcc magic for future optimizations)
CVS patchset: 5853
CVS date: 2003/12/06 18:11:53
Diffstat (limited to 'src/libffmpeg')
| -rw-r--r-- | src/libffmpeg/diff_to_ffmpeg_cvs.txt | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/libffmpeg/diff_to_ffmpeg_cvs.txt b/src/libffmpeg/diff_to_ffmpeg_cvs.txt index abed38ce8..dc4d9924e 100644 --- a/src/libffmpeg/diff_to_ffmpeg_cvs.txt +++ b/src/libffmpeg/diff_to_ffmpeg_cvs.txt @@ -142,6 +142,17 @@ +#define memcpy(a,b,c) xine_fast_memcpy(a,b,c) + +#endif +--- libavcodec/h263.c 2003-11-16 16:02:21.000000000 +0100 ++++ libavcodec/h263.c 2003-12-06 16:53:35.000000000 +0100 +@@ -5097,7 +5097,7 @@ + /* detect buggy encoders which dont set the low_delay flag (divx4/xvid/opendivx)*/ + // note we cannot detect divx5 without b-frames easyly (allthough its buggy too) + if(s->vo_type==0 && s->vol_control_parameters==0 && s->divx_version==0 && s->picture_number==0){ +- printf("looks like this file was encoded with (divx4/(old)xvid/opendivx) -> forcing low_delay flag\n"); ++ //printf("looks like this file was encoded with (divx4/(old)xvid/opendivx) -> forcing low_delay flag\n"); + s->low_delay=1; + } + --- libavcodec/i386/cputest.c 2003-11-01 18:43:19.000000000 +0100 +++ libavcodec/i386/cputest.c 2003-07-02 16:36:41.000000000 +0200 @@ -1,122 +1,13 @@ |