Start working on a branch where FFmpeg is not copied, patched and carved to be built with automake but instead imported inline and built using its own build system. This is an import of a slightly modified FFmpeg current tree. xine-lib builds, install and run fine with it, but there are of course plenty of things that needs to be fixed before it can even be considered for a 1.2.x series. Work will continue in the next days of course.

CVS patchset: 8397
CVS date: 2006/12/02 01:19:48

1 files changed, 0 insertions, 527 deletions

diff --git a/src/libffmpeg/diff_to_ffmpeg_cvs.txt b/src/libffmpeg/diff_to_ffmpeg_cvs.txt
deleted file mode 100644
index 617712ef3..000000000
--- a/src/libffmpeg/diff_to_ffmpeg_cvs.txt
+++ /dev/null
@@ -1,527 +0,0 @@
---- /home/melanson/projects/ffmpeg/libavcodec/avcodec.h	2006-08-01 20:03:33.000000000 -0700
-+++ libavcodec/avcodec.h	2006-08-01 20:55:16.000000000 -0700
-@@ -27,6 +27,13 @@
- #define AV_TIME_BASE            1000000
- #define AV_TIME_BASE_Q          (AVRational){1, AV_TIME_BASE}
- 
-+/* FIXME: We cannot use ffmpeg's XvMC capabilities, since that would require
-+ * linking the ffmpeg plugin against XvMC libraries, which is a bad thing,
-+ * since they are output dependend.
-+ * The correct fix would be to reimplement the XvMC functions libavcodec uses
-+ * and do the necessary talking with our XvMC output plugin there. */
-+#undef HAVE_XVMC
-+
- enum CodecID {
-     CODEC_ID_NONE,
-     CODEC_ID_MPEG1VIDEO,
-@@ -2629,6 +2636,13 @@
- 
- extern unsigned int av_xiphlacing(unsigned char *s, unsigned int v);
- 
-+/* unused static macro */
-+#if defined(__GNUC__) && !defined(DEBUG)
-+/* since we do not compile the encoder part of ffmpeg, some static
-+ * functions will be unused; this is ok, the compiler will take care */
-+#  define static static __attribute__((__unused__))
-+#endif
-+
- #ifdef __cplusplus
- }
- #endif
-
---- /home/melanson/projects/ffmpeg/libavcodec/dsputil.h	2006-08-01 20:03:33.000000000 -0700
-+++ libavcodec/dsputil.h	2006-08-01 20:55:16.000000000 -0700
-@@ -31,6 +31,9 @@
- #include "common.h"
- #include "avcodec.h"
- 
-+#if defined(ARCH_X86) || defined(ARCH_X86_64)
-+#define HAVE_MMX 1
-+#endif
- 
- //#define DEBUG
- /* dct code */
-
---- /home/melanson/projects/ffmpeg/libavcodec/motion_est.c	2006-07-02 20:16:54.000000000 -0700
-+++ libavcodec/motion_est.c	2006-08-01 21:18:45.000000000 -0700
-@@ -21,6 +21,9 @@
-  * new Motion Estimation (X1/EPZS) by Michael Niedermayer <michaelni@gmx.at>
-  */
- 
-+/* motion estimation only needed for encoders */
-+#ifdef CONFIG_ENCODERS
-+
- /**
-  * @file motion_est.c
-  * Motion estimation.
-@@ -2113,3 +2116,5 @@
-         }
-     }
- }
-+
-+#endif /* CONFIG_ENCODERS */
-
---- /home/melanson/projects/ffmpeg/libavcodec/mpeg12.c	2006-07-02 20:16:54.000000000 -0700
-+++ libavcodec/mpeg12.c	2006-08-01 21:18:45.000000000 -0700
-@@ -34,6 +34,13 @@
- //#include <assert.h>
- 
- 
-+/* if xine's MPEG encoder is enabled, enable the encoding features in
-+ * this particular module */
-+#if defined(XINE_MPEG_ENCODER) && !defined(CONFIG_ENCODERS)
-+#define CONFIG_ENCODERS
-+#endif
-+
-+
- /* Start codes. */
- #define SEQ_END_CODE            0x000001b7
- #define SEQ_START_CODE          0x000001b3
-
---- /home/melanson/projects/ffmpeg/libavcodec/mpegvideo.c	2006-08-01 20:03:33.000000000 -0700
-+++ libavcodec/mpegvideo.c	2006-08-01 21:18:45.000000000 -0700
-@@ -38,6 +38,14 @@
- //#undef NDEBUG
- //#include <assert.h>
- 
-+
-+/* if xine's MPEG encoder is enabled, enable the encoding features in
-+ * this particular module */
-+#if defined(XINE_MPEG_ENCODER) && !defined(CONFIG_ENCODERS)
-+#define CONFIG_ENCODERS
-+#endif
-+
-+
- #ifdef CONFIG_ENCODERS
- static void encode_picture(MpegEncContext *s, int picture_number);
- #endif //CONFIG_ENCODERS
-@@ -1165,6 +1173,8 @@
-         s->low_delay= 0; //s->max_b_frames ? 0 : 1;
-         avctx->delay= s->low_delay ? 0 : (s->max_b_frames + 1);
-         break;
-+/* xine: this is never used in either decode or MPEG-1 encode mode */
-+#if 0
-     case CODEC_ID_MPEG2VIDEO:
-         s->out_format = FMT_MPEG1;
-         s->low_delay= 0; //s->max_b_frames ? 0 : 1;
-@@ -1300,6 +1310,7 @@
-         avctx->delay=0;
-         s->low_delay=1;
-         break;
-+#endif /* #if 0 */
-     default:
-         return -1;
-     }
-@@ -1321,6 +1332,8 @@
-     ff_set_cmp(&s->dsp, s->dsp.ildct_cmp, s->avctx->ildct_cmp);
-     ff_set_cmp(&s->dsp, s->dsp.frame_skip_cmp, s->avctx->frame_skip_cmp);
- 
-+/* xine: do not need this for decode or MPEG-1 encoding modes */
-+#if 0
- #ifdef CONFIG_H261_ENCODER
-     if (s->out_format == FMT_H261)
-         ff_h261_encode_init(s);
-@@ -1329,6 +1342,8 @@
-         h263_encode_init(s);
-     if(s->msmpeg4_version)
-         ff_msmpeg4_encode_init(s);
-+#endif /* #if 0 */
-+/* xine: we DO want this for MPEG-1 encoding */
-     if (s->out_format == FMT_MPEG1)
-         ff_mpeg1_encode_init(s);
- 
-@@ -1373,9 +1388,12 @@
- 
-     ff_rate_control_uninit(s);
- 
-+/* xine: do not need this for decode or MPEG-1 encoding modes */
-+#if 0
-     MPV_common_end(s);
-     if (s->out_format == FMT_MJPEG)
-         mjpeg_close(s);
-+#endif /* #if 0 */
- 
-     av_freep(&avctx->extradata);
- 
-@@ -2516,8 +2534,11 @@
- 
-         MPV_frame_end(s);
- 
-+/* xine: do not need this for decode or MPEG-1 encoding modes */
-+#if 0
-         if (s->out_format == FMT_MJPEG)
-             mjpeg_picture_trailer(s);
-+#endif /* #if 0 */
- 
-         if(s->flags&CODEC_FLAG_PASS1)
-             ff_write_pass1_stats(s);
-@@ -4516,6 +4537,8 @@
-     case CODEC_ID_MPEG1VIDEO:
-     case CODEC_ID_MPEG2VIDEO:
-         mpeg1_encode_mb(s, s->block, motion_x, motion_y); break;
-+/* xine: do not need this for decode or MPEG-1 encoding modes */
-+#if 0
-     case CODEC_ID_MPEG4:
-         mpeg4_encode_mb(s, s->block, motion_x, motion_y); break;
-     case CODEC_ID_MSMPEG4V2:
-@@ -4536,6 +4559,7 @@
-         h263_encode_mb(s, s->block, motion_x, motion_y); break;
-     case CODEC_ID_MJPEG:
-         mjpeg_encode_mb(s, s->block); break;
-+#endif /* #if 0 */
-     default:
-         assert(0);
-     }
-@@ -4757,6 +4781,8 @@
-                +sse(s, s->new_picture.data[2] + s->mb_x*8  + s->mb_y*s->uvlinesize*8,s->dest[2], w>>1, h>>1, s->uvlinesize);
- }
- 
-+/* xine: do not need this for decode or MPEG-1 encoding modes */
-+#if 0
- static int pre_estimate_motion_thread(AVCodecContext *c, void *arg){
-     MpegEncContext *s= arg;
- 
-@@ -4800,6 +4826,7 @@
-     }
-     return 0;
- }
-+#endif /* #if 0 */
- 
- static int mb_var_thread(AVCodecContext *c, void *arg){
-     MpegEncContext *s= arg;
-@@ -4824,6 +4851,8 @@
- }
- 
- static void write_slice_end(MpegEncContext *s){
-+/* xine: do not need this for decode or MPEG-1 encoding modes */
-+#if 0
-     if(s->codec_id==CODEC_ID_MPEG4){
-         if(s->partitioned_frame){
-             ff_mpeg4_merge_partitions(s);
-@@ -4833,6 +4862,7 @@
-     }else if(s->out_format == FMT_MJPEG){
-         ff_mjpeg_stuffing(&s->pb);
-     }
-+#endif /* #if 0 */
- 
-     align_put_bits(&s->pb);
-     flush_put_bits(&s->pb);
-@@ -4886,10 +4916,13 @@
-     case CODEC_ID_FLV1:
-         s->gob_index = ff_h263_get_gob_height(s);
-         break;
-+/* xine: do not need this for decode or MPEG-1 encoding modes */
-+#if 0
-     case CODEC_ID_MPEG4:
-         if(s->partitioned_frame)
-             ff_mpeg4_init_partitions(s);
-         break;
-+#endif /* #if 0 */
-     }
- 
-     s->resync_mb_x=0;
-@@ -4962,9 +4995,12 @@
-                     if(s->start_mb_y != mb_y || mb_x!=0){
-                         write_slice_end(s);
- 
-+/* xine: do not need this for decode or MPEG-1 encoding modes */
-+#if 0
-                         if(s->codec_id==CODEC_ID_MPEG4 && s->partitioned_frame){
-                             ff_mpeg4_init_partitions(s);
-                         }
-+#endif /* #if 0 */
-                     }
- 
-                     assert((put_bits_count(&s->pb)&7) == 0);
-@@ -4988,19 +5024,25 @@
-                     }
- 
-                     switch(s->codec_id){
-+/* xine: do not need this for decode or MPEG-1 encoding modes */
-+#if 0
-                     case CODEC_ID_MPEG4:
-                         ff_mpeg4_encode_video_packet_header(s);
-                         ff_mpeg4_clean_buffers(s);
-                     break;
-+#endif /* #if 0 */
-                     case CODEC_ID_MPEG1VIDEO:
-                     case CODEC_ID_MPEG2VIDEO:
-                         ff_mpeg1_encode_slice_header(s);
-                         ff_mpeg1_clean_buffers(s);
-                     break;
-+/* xine: do not need this for decode or MPEG-1 encoding modes */
-+#if 0
-                     case CODEC_ID_H263:
-                     case CODEC_ID_H263P:
-                         h263_encode_gob_header(s, mb_y);
-                     break;
-+#endif /* #if 0 */
-                     }
- 
-                     if(s->flags&CODEC_FLAG_PASS1){
-@@ -5113,7 +5155,10 @@
- 
-                     s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT;
-                     s->mb_intra= 0;
-+/* xine: do not need this for decode or MPEG-1 encoding modes */
-+#if 0
-                     ff_mpeg4_set_direct_mv(s, mx, my);
-+#endif /* #if 0 */
-                     encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_DIRECT, pb, pb2, tex_pb,
-                                  &dmin, &next_block, mx, my);
-                 }
-@@ -5299,7 +5344,10 @@
-                     s->mb_intra= 0;
-                     motion_x=s->b_direct_mv_table[xy][0];
-                     motion_y=s->b_direct_mv_table[xy][1];
-+/* xine: do not need this for decode or MPEG-1 encoding modes */
-+#if 0
-                     ff_mpeg4_set_direct_mv(s, motion_x, motion_y);
-+#endif /* #if 0 */
-                     break;
-                 case CANDIDATE_MB_TYPE_BIDIR:
-                     s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD;
-@@ -5407,8 +5455,11 @@
-     }
- 
-     //not beautiful here but we must write it before flushing so it has to be here
-+/* xine: do not need this for decode or MPEG-1 encoding modes */
-+#if 0
-     if (s->msmpeg4_version && s->msmpeg4_version<4 && s->pict_type == I_TYPE)
-         msmpeg4_encode_ext_header(s);
-+#endif /* #if 0 */
- 
-     write_slice_end(s);
- 
-@@ -5469,6 +5520,8 @@
-         s->current_picture.quality = ff_rate_estimate_qscale(s, dry_run);
- 
-     if(s->adaptive_quant){
-+/* xine: do not need this for decode or MPEG-1 encoding modes */
-+#if 0
-         switch(s->codec_id){
-         case CODEC_ID_MPEG4:
-             ff_clean_mpeg4_qscales(s);
-@@ -5479,6 +5532,7 @@
-             ff_clean_h263_qscales(s);
-             break;
-         }
-+#endif /* #if 0 */
- 
-         s->lambda= s->lambda_table[0];
-         //FIXME broken
-@@ -5499,10 +5553,13 @@
-     s->me.mb_var_sum_temp    =
-     s->me.mc_mb_var_sum_temp = 0;
- 
-+/* xine: do not need this for decode or MPEG-1 encoding modes */
-+#if 0
-     /* we need to initialize some time vars before we can encode b-frames */
-     // RAL: Condition added for MPEG1VIDEO
-     if (s->codec_id == CODEC_ID_MPEG1VIDEO || s->codec_id == CODEC_ID_MPEG2VIDEO || (s->h263_pred && !s->h263_msmpeg4))
-         ff_set_mpeg4_time(s, s->picture_number);  //FIXME rename and use has_b_frames or similar
-+#endif /* #if 0 */
- 
-     s->me.scene_change_score=0;
- 
-@@ -5532,6 +5589,8 @@
-         ff_update_duplicate_context(s->thread_context[i], s);
-     }
- 
-+/* xine: do not need this for decode or MPEG-1 encoding modes */
-+#if 0
-     ff_init_me(s);
- 
-     /* Estimate motion for every MB */
-@@ -5546,6 +5605,8 @@
- 
-         s->avctx->execute(s->avctx, estimate_motion_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count);
-     }else /* if(s->pict_type == I_TYPE) */{
-+#endif /* #if 0 */
-+    {
-         /* I-Frame */
-         for(i=0; i<s->mb_stride*s->mb_height; i++)
-             s->mb_type[i]= CANDIDATE_MB_TYPE_INTRA;
-@@ -5569,6 +5630,8 @@
- //printf("Scene change detected, encoding as I Frame %d %d\n", s->current_picture.mb_var_sum, s->current_picture.mc_mb_var_sum);
-     }
- 
-+/* xine: do not need this for decode or MPEG-1 encoding modes */
-+#if 0
-     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, CANDIDATE_MB_TYPE_INTER);
-@@ -5622,6 +5685,7 @@
-             }
-         }
-     }
-+#endif /* #if 0 */
- 
-     estimate_qp(s, 0);
- 
-@@ -5652,6 +5716,8 @@
- 
-     s->last_bits= put_bits_count(&s->pb);
-     switch(s->out_format) {
-+/* xine: do not need this for decode or MPEG-1 encoding modes */
-+#if 0
-     case FMT_MJPEG:
-         mjpeg_picture_header(s);
-         break;
-@@ -5680,11 +5746,15 @@
-         else
-             h263_encode_picture_header(s, picture_number);
-         break;
-+#endif /* #if 0 */
-     case FMT_MPEG1:
-         mpeg1_encode_picture_header(s, picture_number);
-         break;
-+/* xine: do not need this for decode or MPEG-1 encoding modes */
-+#if 0
-     case FMT_H264:
-         break;
-+#endif /* #if 0 */
-     default:
-         assert(0);
-     }
-
---- /home/melanson/projects/ffmpeg/libavcodec/snow.c	2006-07-02 20:16:54.000000000 -0700
-+++ libavcodec/snow.c	2006-08-01 21:18:45.000000000 -0700
-@@ -1975,6 +1975,7 @@
- #define P_MV1 P[9]
- #define FLAG_QPEL   1 //must be 1
- 
-+#ifdef CONFIG_ENCODERS
- static int encode_q_branch(SnowContext *s, int level, int x, int y){
-     uint8_t p_buffer[1024];
-     uint8_t i_buffer[1024];
-@@ -2203,6 +2204,7 @@
-         return score;
-     }
- }
-+#endif
- 
- static always_inline int same_block(BlockNode *a, BlockNode *b){
-     if((a->type&BLOCK_INTRA) && (b->type&BLOCK_INTRA)){
-@@ -2317,6 +2319,7 @@
-     }
- }
- 
-+#ifdef CONFIG_ENCODERS
- static void encode_blocks(SnowContext *s){
-     int x, y;
-     int w= s->b_width;
-@@ -2338,6 +2341,7 @@
-         }
-     }
- }
-+#endif
- 
- static void decode_blocks(SnowContext *s){
-     int x, y;
-@@ -4030,6 +4034,7 @@
-     }
- }
- 
-+#ifdef CONFIG_ENCODERS
- static int encode_init(AVCodecContext *avctx)
- {
-     SnowContext *s = avctx->priv_data;
-@@ -4117,6 +4122,7 @@
- 
-     return 0;
- }
-+#endif
- 
- static int frame_start(SnowContext *s){
-    AVFrame tmp;
-@@ -4155,6 +4161,7 @@
-     return 0;
- }
- 
-+#ifdef CONFIG_ENCODERS
- static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
-     SnowContext *s = avctx->priv_data;
-     RangeCoder * const c= &s->c;
-@@ -4382,6 +4389,7 @@
- 
-     return ff_rac_terminate(c);
- }
-+#endif
- 
- static void common_end(SnowContext *s){
-     int plane_index, level, orientation, i;
-@@ -4413,6 +4421,7 @@
-     }
- }
- 
-+#ifdef CONFIG_ENCODERS
- static int encode_end(AVCodecContext *avctx)
- {
-     SnowContext *s = avctx->priv_data;
-@@ -4422,6 +4431,7 @@
- 
-     return 0;
- }
-+#endif
- 
- static int decode_init(AVCodecContext *avctx)
- {
-
---- /home/melanson/projects/ffmpeg/libavutil/common.h	2006-08-01 20:03:31.000000000 -0700
-+++ libavutil/./common.h	2006-08-01 21:18:45.000000000 -0700
-@@ -358,4 +358,16 @@
- void *av_realloc(void *ptr, unsigned int size);
- void av_free(void *ptr);
- 
-+/* 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 */
-Index: libavutil/integer.c
-===================================================================
-RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/libavutil/integer.c,v
-retrieving revision 1.2
-diff -u -p -r1.2 integer.c
---- libavutil/integer.c	2 Aug 2006 07:12:57 -0000	1.2
-+++ libavutil/integer.c	13 Sep 2006 21:05:42 -0000
-@@ -124,8 +124,8 @@ AVInteger av_mod_i(AVInteger *quot, AVIn
-     AVInteger quot_temp;
-     if(!quot) quot = &quot_temp;
- 
--    assert((int16_t)a[AV_INTEGER_SIZE-1] >= 0 && (int16_t)b[AV_INTEGER_SIZE-1] >= 0);
--    assert(av_log2(b)>=0);
-+    assert((int16_t)a.v[AV_INTEGER_SIZE-1] >= 0 && (int16_t)b.v[AV_INTEGER_SIZE-1] >= 0);
-+    assert(av_log2_i(b)>=0);
- 
-     if(i > 0)
-         b= av_shr_i(b, -i);
-Index: libavutil/internal.h
-===================================================================
-RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/libavutil/internal.h,v
-retrieving revision 1.1
-diff -u -p -r1.1 internal.h
---- libavutil/internal.h	2 Aug 2006 07:39:20 -0000	1.1
-+++ libavutil/internal.h	13 Sep 2006 21:05:42 -0000
-@@ -87,7 +87,11 @@
- 
- /* dprintf macros */
- #    ifdef DEBUG
--#        define dprintf(fmt,...) av_log(NULL, AV_LOG_DEBUG, fmt, __VA_ARGS__)
-+#        ifdef __GNUC__
-+#            define dprintf(fmt,args...) av_log(NULL, AV_LOG_DEBUG, fmt, ##args)
-+#        else
-+#            define dprintf(fmt,...) av_log(NULL, AV_LOG_DEBUG, fmt, __VA_ARGS__)
-+#        endif
- #    else
- #        define dprintf(fmt,...)
- #    endif