Changeset db7b9410e3cc17b9476890cdd5ec0b956e9a4ccb

Timestamp:

05/26/08 19:51:45 (3 months ago)

Author:

Rafaël Carré <funman@videolan.org>

git-committer:

Rafaël Carré <funman@videolan.org> 1211824305 +0200

git-parent:

[c43e98790c8ccbe82d1095af30d5fb6ee420740e]

git-author:

Rafaël Carré <funman@videolan.org> 1211824305 +0200

Message:

Remove unused HAVE_XXXX_{SWSCALE,FFMPEG}_TREE defines

Files:

• modules/codec/ffmpeg/chroma.c (modified) (3 diffs)
• modules/codec/ffmpeg/demux.c (modified) (2 diffs)
• modules/codec/ffmpeg/ffmpeg.c (modified) (3 diffs)
• modules/codec/ffmpeg/mux.c (modified) (2 diffs)
• modules/codec/ffmpeg/scale.c (modified) (2 diffs)
• modules/codec/ffmpeg/video.c (modified) (1 diff)
• modules/codec/ffmpeg/video_filter.c (modified) (2 diffs)

modules/codec/ffmpeg/chroma.c

@@ -33 +33 @@
-#include <vlc_vout.h>
-
- || defined(HAVE_LIBSWSCALE_TREE)
+
-#include <vlc_filter.h>
-#endif
@@ -48 +48 @@
-#include "ffmpeg.h"
-
- && !defined(HAVE_LIBSWSCALE_TREE)
+
-void InitLibavcodec ( vlc_object_t *p_object );
-static void ChromaConversion( vout_thread_t *, picture_t *, picture_t * );
@@ -364 +364 @@
-}
-
-&& !defined(HAVE_LIBSWSCALE_TREE) 
+

modules/codec/ffmpeg/demux.c

@@ -41 +41 @@
-#elif defined(HAVE_FFMPEG_AVFORMAT_H)
-#   include <ffmpeg/avformat.h>
-#elif defined(HAVE_LIBAVFORMAT_TREE)
-#   include <avformat.h>
-#endif
-
@@ -50 +48 @@
-
-/* Version checking */
- || defined(HAVE_LIBAVFORMAT_TREE)
+
-
-/*****************************************************************************

modules/codec/ffmpeg/ffmpeg.c

@@ -80 +80 @@
-#endif
-
- || defined(HAVE_LIBSWSCALE_TREE)
+
-static int pi_mode_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
-static const char *ppsz_mode_descriptions[] =
@@ -210 +210 @@
-#endif /* ENABLE_SOUT */
-
- || defined(HAVE_LIBAVFORMAT_TREE)
+
-
-    /* demux submodule */
@@ -229 +229 @@
-#endif
-
- || defined(HAVE_LIBSWSCALE_TREE)
+
-    /* video filter submodule */
-    add_submodule();

modules/codec/ffmpeg/mux.c

@@ -39 +39 @@
-#elif defined(HAVE_FFMPEG_AVFORMAT_H)
-#   include <ffmpeg/avformat.h>
-#elif defined(HAVE_LIBAVFORMAT_TREE)
-#   include <avformat.h>
-#endif
-
@@ -48 +46 @@
-
-/* Version checking */
- || defined(HAVE_LIBAVFORMAT_TREE)
+
-
-static const char *ppsz_mux_options[] = {

modules/codec/ffmpeg/scale.c

@@ -47 +47 @@
-#elif defined(HAVE_FFMPEG_SWSCALE_H)
-#   include <ffmpeg/swscale.h>
-#elif defined(HAVE_LIBSWSCALE_TREE)
-#   include <swscale.h>
-#endif
-
@@ -54 +52 @@
-
-/* Version checking */
- || defined(HAVE_LIBSWSCALE_TREE)
+
-
-/*****************************************************************************

modules/codec/ffmpeg/video.c

@@ -870 +870 @@
-                dest_pic.linesize[i] = p_pic->p[i].i_pitch;
-            }
- && !defined(HAVE_LIBSWSCALE_TREE)
+
-            img_convert( &dest_pic, PIX_FMT_YUV420P,
-                         (AVPicture *)p_ff_pic,

modules/codec/ffmpeg/video_filter.c

@@ -46 +46 @@
-#include "ffmpeg.h"
-
- && !defined(HAVE_LIBSWSCALE_TREE)
+
-void InitLibavcodec ( vlc_object_t *p_object );
-static int CheckInit( filter_t *p_filter );
@@ -569 +569 @@
-    return p_pic_dst;
-}
-|| defined(HAVE_LIBSWSCALE_TREE)) 
+