Changeset 791b8caafd1957bfb1ac4a6defb188bb499adf54

Timestamp:

02/29/08 17:44:10 (5 months ago)

Author:

Faustino Osuna <riquedafreak@videolan.org>

git-committer:

Faustino Osuna <riquedafreak@videolan.org> 1204303450 +0000

git-parent:

[afc470b348058a9a59159c987d1c3daee329febb]

git-author:

Faustino Osuna <riquedafreak@videolan.org> 1204303450 +0000

Message:

Let's try this again. Detect older and new versions of ffmpeg and allow for their coexistence within VLC.

Files:

• configure.ac (modified) (5 diffs)
• extras/buildsystem/cmake/config.h.cmake (modified) (1 diff)
• extras/buildsystem/cmake/include/config.cmake (modified) (1 diff)
• modules/codec/ffmpeg/audio.c (modified) (1 diff)
• modules/codec/ffmpeg/chroma.c (modified) (3 diffs)
• modules/codec/ffmpeg/deinterlace.c (modified) (1 diff)
• modules/codec/ffmpeg/demux.c (modified) (3 diffs)
• modules/codec/ffmpeg/encoder.c (modified) (1 diff)
• modules/codec/ffmpeg/ffmpeg.c (modified) (4 diffs)
• modules/codec/ffmpeg/mux.c (modified) (2 diffs)
• modules/codec/ffmpeg/postprocess.c (modified) (1 diff)
• modules/codec/ffmpeg/scale.c (modified) (3 diffs)
• modules/codec/ffmpeg/video.c (modified) (2 diffs)
• modules/codec/ffmpeg/video_filter.c (modified) (3 diffs)
• modules/codec/zvbi.c (modified) (6 diffs)
• modules/stream_out/switcher.c (modified) (1 diff)

configure.ac

@@ -3059 +3059 @@
-     CPPFLAGS="${CPPFLAGS} ${FFMPEG_CFLAGS}"
-     CFLAGS="${CFLAGS} ${FFMPEG_CFLAGS}"
-, [], [AC_MSG_ERROR([Missing header file ffmpeg/avcodec.h.])] 
-, [], [AC_MSG_ERROR([Missing header file ffmpeg/avformat.h.])] 
-, [], [AC_MSG_ERROR([Missing header file ffmpeg/avutil.h.])] 
+ libavcodec/avcodec.h
+ libavformat/avformat.h
+ libavutil/avutil.h
-     dnl newer ffmpeg have a separate libpostproc
-     PKG_CHECK_MODULES(POSTPROC, libpostproc,[
@@ -3069 +3069 @@
-     CPPFLAGS="${CPPFLAGS} ${POSTPROC_CFLAGS}"
-     CFLAGS="${CFLAGS} ${POSTPROC_CFLAGS}"
-, [], [AC_MSG_ERROR([Missing header file postproc/postprocess.h.])] 
+
-     if test "${SYS}" = "darwin"; then
-        VLC_ADD_BUILTINS([ffmpeg])
@@ -3089 +3089 @@
-       VLC_ADD_CFLAGS([ffmpeg],[${SWSCALE_CFLAGS}])
-       VLC_ADD_LIBS([ffmpeg],[${SWSCALE_LIBS}])
-dnl    AC_CHECK_HEADERS(ffmpeg/swscale.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/swscale.h.])])
-       AC_CHECK_LIB(swscale, sws_getContext,
-, ffmpeg
+ libavutil/avutil.h ffmpeg/swscale.h libswscale
-       ],[ true ])
-     VLC_RESTORE_FLAGS
@@ -3101 +3100 @@
-      CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_ffmpeg}"
-      LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg} ${LIBS_ffmpeg}"
-, [], [AC_MSG_ERROR([Missing header file ffmpeg/avcodec.h.])] 
-
-
-, [], [AC_MSG_ERROR([Missing header file postproc/postprocess.h.])] 
+ libavcodec/avcodec.h
+ libavformat/avformat.h
+ libavutil/avutil.h
+
-
-      AC_CHECK_LIB(avutil, av_crc_init, [
@@ -3129 +3128 @@
-
-      AC_CHECK_LIB(swscale, sws_getContext, [
-
+ libswscale/swscale.h
-        VLC_ADD_LIBS([ffmpeg],[-lswscale]) ], [], [-lavcodec $LDAVUTIL])
-      LDFLAGS="${LDFLAGS_save}"

extras/buildsystem/cmake/config.h.cmake

@@ -91 +91 @@
-#cmakedefine HAVE_FFMPEG_AVFORMAT_H
-#cmakedefine HAVE_FFMPEG_AVUTIL_H
-#cmakedefine HAVE_FFMPEG_AVUTIL_H_
-#cmakedefine HAVE_FFMPEG_SWSCALE_H
+#cmakedefine HAVE_LIBAVCODEC_AVCODEC_H
+#cmakedefine HAVE_LIBAVFORMAT_AVFORMAT_H
+#cmakedefine HAVE_LIBAVUTIL_AVUTIL_H
+#cmakedefine HAVE_LIBSWSCALE_SWSCALE_H
-#cmakedefine HAVE_FLAC_STREAM_DECODER_H
-#cmakedefine HAVE_FONTCONFIG_FONTCONFIG_H

extras/buildsystem/cmake/include/config.cmake

@@ -465 +465 @@
-  set( CMAKE_REQUIRED_FLAGS ${FFmpeg_CFLAGS} )
-
-
-
-
-
+
+
+
-  
-  check_include_files ("stdint.h;postproc/postprocess.h" HAVE_POSTPROC_POSTPROCESS_H)

modules/codec/ffmpeg/audio.c

@@ -36 +36 @@
-
-/* ffmpeg header */
-
+
+
+
-#   include <ffmpeg/avcodec.h>
-#else

modules/codec/ffmpeg/chroma.c

@@ -33 +33 @@
-#include <vlc_vout.h>
-
-
+LIBSWSCALE_SWSCALE_H)  || defined(HAVE_
-#include <vlc_filter.h>
-#endif
-
-/* ffmpeg header */
-
+
+
+
-#   include <ffmpeg/avcodec.h>
-#else
@@ -46 +48 @@
-#include "ffmpeg.h"
-
-
+LIBSWSCALE_SWSCALE_H)  && !defined(HAVE_
-void E_(InitLibavcodec) ( vlc_object_t *p_object );
-static void ChromaConversion( vout_thread_t *, picture_t *, picture_t * );
@@ -362 +364 @@
-}
-
-
+LIBSWSCALE_SWSCALE_H)  && !defined(HAVE_

modules/codec/ffmpeg/deinterlace.c

@@ -36 +36 @@
-
-/* ffmpeg header */
-
+
+
+
-#   include <ffmpeg/avcodec.h>
-#else

modules/codec/ffmpeg/demux.c

@@ -37 +37 @@
-
-/* ffmpeg header */
-
+
+
+
-#   include <ffmpeg/avformat.h>
-#elif defined(HAVE_LIBAVFORMAT_TREE)
@@ -48 +50 @@
-
-/* Version checking */
-FFMPEG_AVFORMAT_H) || defined(HAVE_LIBAVFORMAT
+LIBSWSCALE_SWSCALE_H) || defined(HAVE_LIBSWSCALE_SWSCALE_H)  || defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE
-
-/*****************************************************************************
@@ -502 +504 @@
-}
-
-FFMPEG
+LIBAVFORMAT

modules/codec/ffmpeg/encoder.c

@@ -42 +42 @@
-/* ffmpeg header */
-#define HAVE_MMX 1
-
+
+
+
-#   include <ffmpeg/avcodec.h>
-#else

modules/codec/ffmpeg/ffmpeg.c

@@ -35 +35 @@
-/* ffmpeg header */
-#define HAVE_MMX 1
-
+
+
+
-#   include <ffmpeg/avcodec.h>
-#else
@@ -75 +77 @@
-static const char *enc_hq_list_text[] = { N_("rd"), N_("bits"), N_("simple") };
-
-
+LIBSWSCALE_SWSCALE_H)  || defined(HAVE_
-static int pi_mode_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
-static const char *ppsz_mode_descriptions[] =
@@ -197 +199 @@
-                 ENC_CHROMA_ELIM_TEXT, ENC_CHROMA_ELIM_LONGTEXT, VLC_TRUE );
-
-
+LIBAVFORMAT_AVFORMAT_H) || defined(HAVE_
-    /* demux submodule */
-    add_submodule();
@@ -213 +215 @@
-#endif
-
-
+LIBSWSCALE_SWSCALE_H)  || defined(HAVE_
-    /* video filter submodule */
-    add_submodule();

modules/codec/ffmpeg/mux.c

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

modules/codec/ffmpeg/postprocess.c

@@ -32 +32 @@
-
-/* ffmpeg header */
-
+
+
+
-#   include <ffmpeg/avcodec.h>
-#else

modules/codec/ffmpeg/scale.c

@@ -35 +35 @@
-
-/* ffmpeg headers */
-
+
+
+
-#   include <ffmpeg/avcodec.h>
-#else
@@ -41 +43 @@
-#endif
-
-
+
+
+
-#   include <ffmpeg/swscale.h>
-#elif defined(HAVE_LIBSWSCALE_TREE)
@@ -50 +54 @@
-
-/* Version checking */
-
+LIBSWSCALE_SWSCALE_H)  || defined(HAVE_
-
-/*****************************************************************************

modules/codec/ffmpeg/video.c

@@ -36 +36 @@
-
-/* ffmpeg header */
-
+
+
+
-#   include <ffmpeg/avcodec.h>
-#else
@@ -844 +846 @@
-                dest_pic.linesize[i] = p_pic->p[i].i_pitch;
-            }
-
+LIBSWSCALE_SWSCALE_H)  && !defined(HAVE_
-            img_convert( &dest_pic, PIX_FMT_YUV420P,
-                         (AVPicture *)p_ff_pic,

modules/codec/ffmpeg/video_filter.c

@@ -36 +36 @@
-
-/* ffmpeg header */
-
+
+
+
-#   include <ffmpeg/avcodec.h>
-#else
@@ -44 +46 @@
-#include "ffmpeg.h"
-
-
+LIBSWSCALE_SWSCALE_H)  && !defined(HAVE_
-void E_(InitLibavcodec) ( vlc_object_t *p_object );
-static int CheckInit( filter_t *p_filter );
@@ -567 +569 @@
-    return p_pic_dst;
-}
-
+LIBSWSCALE_SWSCALE_H)  || defined(HAVE_

modules/codec/zvbi.c

@@ -137 +137 @@
-
-    /* Misc */
-def HAVE_FFMPEG_SWSCALE_H
+ defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE_SWSCALE_H)
-    image_handler_t         *p_image;
-#endif
@@ -182 +182 @@
-    memset( p_sys, 0, sizeof(decoder_sys_t) );
-
-def HAVE_FFMPEG_SWSCALE_H
+ defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE_SWSCALE_H)
-    p_sys->p_image = image_HandlerCreate( VLC_OBJECT(p_dec) );
-    if( !p_sys->p_image )
@@ -226 +226 @@
-        p_dec->fmt_out.video.i_chroma = VLC_FOURCC('T','E','X','T');
-    else
-def HAVE_FFMPEG_SWSCALE_H
+ defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE_SWSCALE_H)
-        p_dec->fmt_out.video.i_chroma = VLC_FOURCC('Y','U','V','A');
-#else
@@ -247 +247 @@
-    var_DelCallback( p_dec, "vbi-opaque", Opaque, p_sys );
-
-def HAVE_FFMPEG_SWSCALE_H
+ defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE_SWSCALE_H)
-    if( p_sys->p_image ) image_HandlerDelete( p_sys->p_image );
-#endif
@@ -324 +324 @@
-    memset( &fmt, 0, sizeof(video_format_t) );
-    fmt.i_chroma = p_sys->b_text ? VLC_FOURCC('T','E','X','T') :
-def HAVE_FFMPEG_SWSCALE_H
+ defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE_SWSCALE_H)
-                                   VLC_FOURCC('Y','U','V','A');
-#else
@@ -384 +384 @@
-    else
-    {
-def HAVE_FFMPEG_SWSCALE_H
+ defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE_SWSCALE_H)
-        video_format_t fmt_in;
-        picture_t *p_pic, *p_dest;

modules/stream_out/switcher.c

@@ -39 +39 @@
-
-#define HAVE_MMX
-
+
+
+
-#   include <ffmpeg/avcodec.h>
-#else