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

[vlc] / modules / codec / ffmpeg / ffmpeg.c

diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c
index 7d393a140dd256ff4fc7d517cbf84cebc0f5b82b..a9a7a4728ab6c2df3a61bfe57786a42865140e0b 100644 (file)
--- a/modules/codec/ffmpeg/ffmpeg.c
+++ b/modules/codec/ffmpeg/ffmpeg.c
@@ -25,12 +25,18 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 #include <vlc_codec.h>
 
 /* ffmpeg header */
 #define HAVE_MMX 1
-#ifdef HAVE_FFMPEG_AVCODEC_H
+#ifdef HAVE_LIBAVCODEC_AVCODEC_H
+#   include <libavcodec/avcodec.h>
+#elif defined(HAVE_FFMPEG_AVCODEC_H)
 #   include <ffmpeg/avcodec.h>
 #else
 #   include <avcodec.h>
@@ -70,7 +76,7 @@ static const char *nloopf_list_text[] =
 static const char *enc_hq_list[] = { "rd", "bits", "simple" };
 static const char *enc_hq_list_text[] = { N_("rd"), N_("bits"), N_("simple") };
 
-#if defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE_TREE)
+#if defined(HAVE_LIBSWSCALE_SWSCALE_H)  || defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE_TREE)
 static int pi_mode_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
 static const char *ppsz_mode_descriptions[] =
 { N_("Fast bilinear"), N_("Bilinear"), N_("Bicubic (good quality)"),
@@ -192,6 +198,7 @@ vlc_module_begin();
     add_integer( ENC_CFG_PREFIX "chroma-elim-threshold", 0, NULL,
                  ENC_CHROMA_ELIM_TEXT, ENC_CHROMA_ELIM_LONGTEXT, VLC_TRUE );
 
+#if defined(HAVE_LIBAVFORMAT_AVFORMAT_H) || defined(HAVE_FFMPEG_AVFORMAT_H) || defined(HAVE_LIBAVFORMAT_TREE)
     /* demux submodule */
     add_submodule();
     set_description( _("FFmpeg demuxer" ) );
@@ -205,8 +212,9 @@ vlc_module_begin();
     add_string( "ffmpeg-mux", NULL, NULL, MUX_TEXT,
                 MUX_LONGTEXT, VLC_TRUE );
     set_callbacks( E_(OpenMux), E_(CloseMux) );
+#endif
 
-#if defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE_TREE)
+#if defined(HAVE_LIBSWSCALE_SWSCALE_H)  || defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE_TREE)
     /* video filter submodule */
     add_submodule();
     set_description( _("Video scaling filter") );
@@ -216,13 +224,8 @@ vlc_module_begin();
     set_callbacks( E_(OpenScaler), E_(CloseScaler) );
     add_integer( "swscale-mode", 0, NULL, SCALEMODE_TEXT, SCALEMODE_LONGTEXT, VLC_TRUE );
         change_integer_list( pi_mode_values, ppsz_mode_descriptions, 0 );
-#else
-    /* chroma conversion submodule */
-    add_submodule();
-    set_capability( "chroma", 50 );
-    set_callbacks( E_(OpenChroma), E_(CloseChroma) );
-    set_description( _("FFmpeg chroma conversion") );
 
+#else
     /* video filter submodule */
     add_submodule();
     set_capability( "video filter2", 50 );
@@ -234,6 +237,13 @@ vlc_module_begin();
     set_capability( "crop padd", 10 );
     set_callbacks( E_(OpenCropPadd), E_(CloseFilter) );
     set_description( _("FFmpeg crop padd filter") );
+#endif
+
+    /* chroma conversion submodule */
+    add_submodule();
+    set_capability( "chroma", 50 );
+    set_callbacks( E_(OpenChroma), E_(CloseChroma) );
+    set_description( _("FFmpeg chroma conversion") );
 
     /* video filter submodule */
     add_submodule();
@@ -241,7 +251,6 @@ vlc_module_begin();
     set_callbacks( E_(OpenDeinterlace), E_(CloseDeinterlace) );
     set_description( _("FFmpeg deinterlace video filter") );
     add_shortcut( "ffmpeg-deinterlace" );
-#endif
 
 vlc_module_end();
 
@@ -483,11 +492,17 @@ static struct
     { VLC_FOURCC('U','Y','V','Y'), PIX_FMT_UYVY422 },
 
     /* Packed RGB formats */
+#if defined(WORDS_BIGENDIAN)
+    { VLC_FOURCC('R','V','1','5'), PIX_FMT_BGR555 },
+    { VLC_FOURCC('R','V','1','6'), PIX_FMT_BGR565 },
+    { VLC_FOURCC('R','V','2','4'), PIX_FMT_BGR24 },
+#else
     { VLC_FOURCC('R','V','1','5'), PIX_FMT_RGB555 },
     { VLC_FOURCC('R','V','1','6'), PIX_FMT_RGB565 },
     { VLC_FOURCC('R','V','2','4'), PIX_FMT_RGB24 },
+#endif
     { VLC_FOURCC('R','V','3','2'), PIX_FMT_RGBA32 },
-#if defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE_TREE)
+#if defined(PIX_FMT_RGBA)
     { VLC_FOURCC('R','G','B','A'), PIX_FMT_RGBA },
 #endif
     { VLC_FOURCC('G','R','E','Y'), PIX_FMT_GRAY8 },
@@ -577,6 +592,10 @@ static struct
     /* ATI VCR2 */
     { VLC_FOURCC('V','C','R','2'), CODEC_ID_MPEG2VIDEO,
       VIDEO_ES, "ATI VCR2 Video" },
+    { VLC_FOURCC('M','M','E','S'), CODEC_ID_MPEG2VIDEO,
+      VIDEO_ES, "Matrox MPEG-2" },
+    { VLC_FOURCC('m','m','e','s'), CODEC_ID_MPEG2VIDEO,
+      VIDEO_ES, "Matrox MPEG-2" },
 
     /* MPEG-4 Video */
     { VLC_FOURCC('D','I','V','X'), CODEC_ID_MPEG4,
@@ -993,6 +1012,11 @@ static struct
       VIDEO_ES, "On2's VP6.1 Video" },
 #endif
 
+#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(47<<8)+0)
+    { VLC_FOURCC('V','P','6','A'), CODEC_ID_VP6A,
+      VIDEO_ES, "On2's VP6 A Video" },
+#endif
+
     /* Xiph.org theora */
     { VLC_FOURCC('t','h','e','o'), CODEC_ID_THEORA,
       VIDEO_ES, "Xiph.org's Theora Video" },
@@ -1285,10 +1309,17 @@ static struct
     { VLC_FOURCC('M','P','C',' '), CODEC_ID_MUSEPACK7,
       AUDIO_ES, "MUSEPACK7 Audio" },
 #endif
+#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(48<<8)+0)
+    /* MUSEPACK8 Audio */
+    { VLC_FOURCC('M','P','C','K'), CODEC_ID_MUSEPACK8,
+      AUDIO_ES, "MUSEPACK8 Audio" },
+#endif
 
     /* RealAudio 1.0 */
     { VLC_FOURCC('1','4','_','4'), CODEC_ID_RA_144,
       AUDIO_ES, "RealAudio 1.0" },
+    { VLC_FOURCC('l','p','c','J'), CODEC_ID_RA_144,
+      AUDIO_ES, "RealAudio 1.0" },
 
     /* RealAudio 2.0 */
     { VLC_FOURCC('2','8','_','8'), CODEC_ID_RA_288,
@@ -1432,7 +1463,14 @@ static struct
 #endif
     { VLC_FOURCC(0x22,0x0,0x0,0x0), CODEC_ID_TRUESPEECH,
       AUDIO_ES, "TrueSpeech" },
-
+#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(46<<8)+0)
+    { VLC_FOURCC('N','E','L','L'), CODEC_ID_NELLYMOSER,
+      AUDIO_ES, "NellyMoser ASAO" },
+#endif
+#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(44<<8)+0)
+    { VLC_FOURCC('A','P','E',' '), CODEC_ID_APE,
+      AUDIO_ES, "Monkey's Audio" },
+#endif
     /* PCM */
     { VLC_FOURCC('s','8',' ',' '), CODEC_ID_PCM_S8,
       AUDIO_ES, "PCM S8" },