diff options
Diffstat (limited to 'src/libffmpeg/diff_to_ffmpeg_cvs.txt')
| -rw-r--r-- | src/libffmpeg/diff_to_ffmpeg_cvs.txt | 324 |
1 files changed, 149 insertions, 175 deletions
diff --git a/src/libffmpeg/diff_to_ffmpeg_cvs.txt b/src/libffmpeg/diff_to_ffmpeg_cvs.txt index 627cb4750..f68156a78 100644 --- a/src/libffmpeg/diff_to_ffmpeg_cvs.txt +++ b/src/libffmpeg/diff_to_ffmpeg_cvs.txt @@ -1,19 +1,18 @@ -? ffmpeg-030211.patch Index: libavcodec/common.h =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/common.h,v -retrieving revision 1.87 -diff -u -r1.87 common.h ---- libavcodec/common.h 26 Mar 2003 10:39:34 -0000 1.87 -+++ libavcodec/common.h 26 Mar 2003 13:49:18 -0000 -@@ -178,11 +178,19 @@ +retrieving revision 1.106 +diff -u -u -r1.106 common.h +--- libavcodec/common.h 20 Oct 2003 20:23:46 -0000 1.106 ++++ libavcodec/common.h 21 Oct 2003 12:10:49 -0000 +@@ -184,11 +184,19 @@ # else -# ifdef DEBUG --# define dprintf(fmt,args...) printf(fmt, ## args) +-# define dprintf(fmt,...) printf(fmt, __VA_ARGS__) -# else --# define dprintf(fmt,args...) +-# define dprintf(fmt,...) -# endif +#if __GNUC__ +#ifdef DEBUG @@ -34,10 +33,10 @@ diff -u -r1.87 common.h Index: libavcodec/dsputil.h =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/dsputil.h,v -retrieving revision 1.60 -diff -u -r1.60 dsputil.h ---- libavcodec/dsputil.h 15 Mar 2003 02:06:09 -0000 1.60 -+++ libavcodec/dsputil.h 26 Mar 2003 13:49:18 -0000 +retrieving revision 1.74 +diff -u -u -r1.74 dsputil.h +--- libavcodec/dsputil.h 13 Oct 2003 17:27:30 -0000 1.74 ++++ libavcodec/dsputil.h 21 Oct 2003 12:10:51 -0000 @@ -29,9 +29,14 @@ #include "common.h" @@ -53,8 +52,8 @@ diff -u -r1.60 dsputil.h -//#define DEBUG /* dct code */ typedef short DCTELEM; - //typedef int DCTELEM; -@@ -310,21 +315,25 @@ + +@@ -317,21 +322,25 @@ #undef emms_c @@ -80,13 +79,106 @@ diff -u -r1.60 dsputil.h #define emms_c() \ +Index: libavcodec/fastmemcpy.h +=================================================================== +RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/fastmemcpy.h,v +retrieving revision 1.1 +diff -u -u -r1.1 fastmemcpy.h +--- libavcodec/fastmemcpy.h 2 Aug 2001 08:29:38 -0000 1.1 ++++ libavcodec/fastmemcpy.h 21 Oct 2003 12:10:53 -0000 +@@ -1 +1,8 @@ +-#include "../libvo/fastmemcpy.h" ++#ifndef __FASTMEMCPY_H__ ++#define __FASTMEMCPY_H__ ++ ++#include "xineutils.h" ++ ++#define memcpy(a,b,c) xine_fast_memcpy(a,b,c) ++ ++#endif +Index: libavcodec/mjpeg.c +=================================================================== +RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mjpeg.c,v +retrieving revision 1.78 +diff -u -u -r1.78 mjpeg.c +--- libavcodec/mjpeg.c 20 Oct 2003 20:23:46 -0000 1.78 ++++ libavcodec/mjpeg.c 21 Oct 2003 12:11:08 -0000 +@@ -1504,7 +1504,7 @@ + 4bytes field_size + 4bytes field_size_less_padding + */ +- s->buggy_avid = 1; ++// s->buggy_avid = 1; + // if (s->first_picture) + // printf("mjpeg: workarounding buggy AVID\n"); + s->interlace_polarity = get_bits(&s->gb, 8); +Index: libavcodec/mpegvideo.c +=================================================================== +RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mpegvideo.c,v +retrieving revision 1.291 +diff -u -u -r1.291 mpegvideo.c +--- libavcodec/mpegvideo.c 20 Oct 2003 09:52:02 -0000 1.291 ++++ libavcodec/mpegvideo.c 21 Oct 2003 12:11:17 -0000 +@@ -836,7 +836,9 @@ + if (MPV_common_init(s) < 0) + return -1; + ++#ifdef CONFIG_ENCODERS_FULL + ff_init_me(s); ++#endif + + #ifdef CONFIG_ENCODERS + #ifdef CONFIG_RISKY +@@ -1637,8 +1639,10 @@ + if (s->out_format == FMT_MJPEG) + mjpeg_picture_trailer(s); + ++#ifdef CONFIG_ENCODERS_FULL + if(s->flags&CODEC_FLAG_PASS1) + ff_write_pass1_stats(s); ++#endif + + for(i=0; i<4; i++){ + avctx->error[i] += s->current_picture_ptr->error[i]; +@@ -3362,6 +3366,7 @@ + /* Estimate motion for every MB */ + s->mb_intra=0; //for the rate distoration & bit compare functions + if(s->pict_type != I_TYPE){ ++#ifdef CONFIG_ENCODERS_FULL + if(s->pict_type != B_TYPE){ + if((s->avctx->pre_me && s->last_non_b_pict_type==I_TYPE) || s->avctx->pre_me==2){ + s->me.pre_pass=1; +@@ -3399,6 +3404,7 @@ + ff_estimate_p_frame_motion(s, mb_x, mb_y); + } + } ++#endif + }else /* if(s->pict_type == I_TYPE) */{ + /* I-Frame */ + //FIXME do we need to zero them? +@@ -3433,6 +3439,7 @@ + //printf("Scene change detected, encoding as I Frame %d %d\n", s->current_picture.mb_var_sum, s->current_picture.mc_mb_var_sum); + } + ++#ifdef CONFIG_ENCODERS_FULL + if(!s->umvplus){ + if(s->pict_type==P_TYPE || s->pict_type==S_TYPE) { + s->f_code= ff_get_best_fcode(s, s->p_mv_table, MB_TYPE_INTER); +@@ -3457,6 +3464,7 @@ + ff_fix_long_b_mvs(s, s->b_bidir_back_mv_table, s->b_code, MB_TYPE_BIDIR); + } + } ++#endif + + if (!s->fixed_qscale) + s->current_picture.quality = ff_rate_estimate_qscale(s); Index: libavcodec/i386/cputest.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/i386/cputest.c,v retrieving revision 1.8 -diff -u -r1.8 cputest.c +diff -u -u -r1.8 cputest.c --- libavcodec/i386/cputest.c 26 Nov 2002 16:26:58 -0000 1.8 -+++ libavcodec/i386/cputest.c 26 Mar 2003 13:49:19 -0000 ++++ libavcodec/i386/cputest.c 21 Oct 2003 12:11:37 -0000 @@ -1,122 +1,13 @@ -/* Cpu detection code, extracted from mmx.h ((c)1997-99 by H. Dietz - and R. Fisher). Converted to C and improved by Fabrice Bellard */ @@ -217,9 +309,9 @@ Index: libavcodec/i386/mmx.h =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/i386/mmx.h,v retrieving revision 1.3 -diff -u -r1.3 mmx.h +diff -u -u -r1.3 mmx.h --- libavcodec/i386/mmx.h 27 May 2002 08:31:54 -0000 1.3 -+++ libavcodec/i386/mmx.h 26 Mar 2003 13:49:19 -0000 ++++ libavcodec/i386/mmx.h 21 Oct 2003 12:11:38 -0000 @@ -1,243 +1 @@ -/* - * mmx.h @@ -465,13 +557,29 @@ diff -u -r1.3 mmx.h - -#endif /* AVCODEC_I386MMX_H */ +#include "xineutils.h" +Index: libavcodec/i386/motion_est_mmx.c +=================================================================== +RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/i386/motion_est_mmx.c,v +retrieving revision 1.11 +diff -u -u -r1.11 motion_est_mmx.c +--- libavcodec/i386/motion_est_mmx.c 9 Sep 2003 22:59:16 -0000 1.11 ++++ libavcodec/i386/motion_est_mmx.c 21 Oct 2003 12:11:39 -0000 +@@ -26,7 +26,7 @@ + 0x0002000200020002, + }; + +-static __attribute__ ((aligned(8), unused)) uint64_t bone= 0x0101010101010101LL; ++static const __attribute__ ((aligned(8), unused)) uint64_t bone= 0x0101010101010101LL; + + static inline void sad8_mmx(uint8_t *blk1, uint8_t *blk2, int stride, int h) + { Index: libavcodec/libpostproc/postprocess.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/libpostproc/postprocess.c,v -retrieving revision 1.83 -diff -u -r1.83 postprocess.c ---- libavcodec/libpostproc/postprocess.c 6 Mar 2003 13:51:18 -0000 1.83 -+++ libavcodec/libpostproc/postprocess.c 26 Mar 2003 13:49:20 -0000 +retrieving revision 1.90 +diff -u -u -r1.90 postprocess.c +--- libavcodec/libpostproc/postprocess.c 14 Sep 2003 16:52:34 -0000 1.90 ++++ libavcodec/libpostproc/postprocess.c 21 Oct 2003 12:11:40 -0000 @@ -70,8 +70,9 @@ #include "config.h" #include <inttypes.h> @@ -489,7 +597,7 @@ diff -u -r1.83 postprocess.c //#undef ARCH_X86 //#define DEBUG_BRIGHTNESS -#ifdef USE_FASTMEMCPY --#include "libvo/fastmemcpy.h" +-#include "../fastmemcpy.h" -#endif + +#define memcpy(a,b,c) xine_fast_memcpy(a,b,c) @@ -518,10 +626,13 @@ diff -u -r1.83 postprocess.c #endif -@@ -159,37 +160,6 @@ - } - #endif - +@@ -156,37 +157,6 @@ + static inline void unusedVariableWarningFixer() + { + if(w05 + w20 + b00 + b01 + b02 + b08 + b80 == 0) b00=0; +-} +-#endif +- - -#ifdef ARCH_X86 -static inline void prefetchnta(void *p) @@ -550,154 +661,17 @@ diff -u -r1.83 postprocess.c - asm volatile( "prefetcht2 (%0)\n\t" - : : "r" (p) - ); --} --#endif -- - // The horizontal Functions exist only in C cuz the MMX code is faster with vertical filters and transposing - - /** -Index: libavcodec/mjpeg.c -=================================================================== -RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mjpeg.c,v -retrieving revision 1.61 -diff -u -r1.61 mjpeg.c ---- libavcodec/mjpeg.c 23 May 2003 16:04:24 -0000 1.61 -+++ libavcodec/mjpeg.c 23 May 2003 18:18:53 -0000 -@@ -1471,7 +1471,7 @@ - 4bytes field_size - 4bytes field_size_less_padding - */ -- s->buggy_avid = 1; -+// s->buggy_avid = 1; - // if (s->first_picture) - // printf("mjpeg: workarounding buggy AVID\n"); - s->interlace_polarity = get_bits(&s->gb, 8); -Index: libavcodec/mpegvideo.c -=================================================================== -RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/libavcodec/mpegvideo.c,v -retrieving revision 1.31 -diff -u -r1.31 mpegvideo.c ---- libavcodec/mpegvideo.c 9 May 2003 23:54:05 -0000 1.31 -+++ libavcodec/mpegvideo.c 25 May 2003 18:29:52 -0000 -@@ -763,7 +763,9 @@ - if (MPV_common_init(s) < 0) - return -1; - -+#ifdef CONFIG_ENCODERS_FULL - ff_init_me(s); -+#endif - - #ifdef CONFIG_ENCODERS - #ifdef CONFIG_RISKY -@@ -1550,8 +1552,10 @@ - if (s->out_format == FMT_MJPEG) - mjpeg_picture_trailer(s); - -+#ifdef CONFIG_ENCODERS_FULL - if(s->flags&CODEC_FLAG_PASS1) - ff_write_pass1_stats(s); -+#endif - - for(i=0; i<4; i++){ - avctx->error[i] += s->current_picture_ptr->error[i]; -@@ -3137,6 +3141,7 @@ - /* Estimate motion for every MB */ - s->mb_intra=0; //for the rate distoration & bit compare functions - if(s->pict_type != I_TYPE){ -+#ifdef CONFIG_ENCODERS_FULL - if(s->pict_type != B_TYPE){ - if((s->avctx->pre_me && s->last_non_b_pict_type==I_TYPE) || s->avctx->pre_me==2){ - s->me.pre_pass=1; -@@ -3174,6 +3179,7 @@ - ff_estimate_p_frame_motion(s, mb_x, mb_y); - } - } -+#endif - }else /* if(s->pict_type == I_TYPE) */{ - /* I-Frame */ - //FIXME do we need to zero them? -@@ -3208,6 +3214,7 @@ - //printf("Scene change detected, encoding as I Frame %d %d\n", s->current_picture.mb_var_sum, s->current_picture.mc_mb_var_sum); - } - -+#ifdef CONFIG_ENCODERS_FULL - if(!s->umvplus){ - if(s->pict_type==P_TYPE || s->pict_type==S_TYPE) { - s->f_code= ff_get_best_fcode(s, s->p_mv_table, MB_TYPE_INTER); -@@ -3232,6 +3239,7 @@ - ff_fix_long_b_mvs(s, s->b_bidir_back_mv_table, s->b_code, MB_TYPE_BIDIR); - } - } -+#endif - - if (s->fixed_qscale) - s->frame_qscale = s->current_picture.quality; -Index: libavcodec/h263.c -=================================================================== -RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/libavcodec/h263.c,v -retrieving revision 1.29 -diff -u -r1.29 h263.c ---- libavcodec/h263.c 19 Jun 2003 00:47:19 -0000 1.29 -+++ libavcodec/h263.c 27 Jun 2003 13:51:30 -0000 -@@ -4606,6 +4606,7 @@ - s->divx_version= ver; - s->divx_build= build; - s->divx_packed= e==3 && last=='p'; -+#if 0 - if(s->picture_number==0){ - printf("This file was encoded with DivX%d Build%d", ver, build); - if(s->divx_packed) -@@ -4613,6 +4614,7 @@ - else - printf("\n"); - } -+#endif - } - - /* ffmpeg detection */ -@@ -4628,16 +4630,20 @@ - if(e==4){ - s->ffmpeg_version= ver*256*256 + ver2*256 + ver3; - s->lavc_build= build; -+#if 0 - if(s->picture_number==0) - printf("This file was encoded with libavcodec build %d\n", build); -+#endif - } - - /* xvid detection */ - e=sscanf(buf, "XviD%d", &build); - if(e==1){ - s->xvid_build= build; -+#if 0 - if(s->picture_number==0) - printf("This file was encoded with XviD build %d\n", build); -+#endif - } - - //printf("User Data: %s\n", buf); -Index: libavcodec/i386/motion_est_mmx.c -=================================================================== -RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/libavcodec/i386/motion_est_mmx.c,v -retrieving revision 1.8 -diff -u -r1.8 motion_est_mmx.c ---- libavcodec/i386/motion_est_mmx.c 26 Mar 2003 14:44:17 -0000 1.8 -+++ libavcodec/i386/motion_est_mmx.c 2 Jul 2003 14:31:19 -0000 -@@ -26,7 +26,7 @@ - 0x0002000200020002, - }; - --static __attribute__ ((aligned(8))) uint64_t bone= 0x0101010101010101LL; -+static const __attribute__ ((aligned(8))) uint64_t bone= 0x0101010101010101LL; + } + #endif - static inline void sad8_mmx(uint8_t *blk1, uint8_t *blk2, int stride, int h) - { Index: libavcodec/mlib/dsputil_mlib.c =================================================================== -RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/libavcodec/mlib/dsputil_mlib.c,v ---- dsputil_mlib,c 2003-10-19 13:06:27.560738000 +0100 -+++ dsputil_mlib.c 2003-10-19 13:01:50.427851000 +0100 -@@ -414,6 +414,7 @@ +RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mlib/dsputil_mlib.c,v +retrieving revision 1.14 +diff -u -u -r1.14 dsputil_mlib.c +--- libavcodec/mlib/dsputil_mlib.c 11 Oct 2003 16:43:51 -0000 1.14 ++++ libavcodec/mlib/dsputil_mlib.c 21 Oct 2003 12:11:42 -0000 +@@ -419,6 +419,7 @@ void dsputil_init_mlib(DSPContext* c, AVCodecContext *avctx) { @@ -705,7 +679,7 @@ RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/libavcodec/mlib/dsputil_mlib.c,v c->get_pixels = get_pixels_mlib; c->diff_pixels = diff_pixels_mlib; c->add_pixels_clamped = add_pixels_clamped_mlib; -@@ -440,10 +441,12 @@ +@@ -445,10 +446,12 @@ c->put_no_rnd_pixels_tab[1][0] = put_pixels8_mlib; c->bswap_buf = bswap_buf_mlib; @@ -718,8 +692,8 @@ RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/libavcodec/mlib/dsputil_mlib.c,v if(s->avctx->dct_algo==FF_DCT_AUTO || s->avctx->dct_algo==FF_DCT_MLIB){ s->dsp.fdct = ff_fdct_mlib; } -@@ -453,4 +456,5 @@ - s->dsp.idct_add = ff_idct_add_mlib; +@@ -459,4 +462,5 @@ + s->dsp.idct = ff_idct_mlib; s->dsp.idct_permutation_type= FF_NO_IDCT_PERM; } + } |