search for: have_ffmpeg

...put a required version in here dnl to detect ffmpeg. But as it stands even pkg-config versions are weird. dnl So you'll have to update your ffmpeg checkout if compilation fails. dnl Or you submit a patch that detects ffmpeg reliably on the distros. -PKG_CHECK_MODULES(FFMPEG, libavcodec, HAVE_FFMPEG=yes, HAVE_FFMPEG=no) -AC_SUBST(FFMPEG_CFLAGS) -AC_SUBST(FFMPEG_LIBS) -if test "x$HAVE_FFMPEG" = xyes; then - AC_DEFINE(HAVE_FFMPEG, 1, [Define if ffmpeg is enabled]) +AC_ARG_ENABLE(ffmpeg, + AS_HELP_STRING([--enable-ffmpeg], + [enable ffmpeg support (default=yes)])], + enable_ffmpeg=$e...

...able ffmpeg support (default=yes)])], - enable_ffmpeg=$enableval, - enable_ffmpeg="yes") + enable_ffmpeg=$enableval) -if test "$enable_ffmpeg" = "yes"; then +if test "$enable_ffmpeg" != "no"; then PKG_CHECK_MODULES(FFMPEG, libavcodec libswscale, HAVE_FFMPEG=yes, HAVE_FFMPEG=no) AC_SUBST(FFMPEG_CFLAGS) AC_SUBST(FFMPEG_LIBS) if test "x$HAVE_FFMPEG" = xyes; then AC_DEFINE(HAVE_FFMPEG, 1, [Define if ffmpeg is enabled]) else - AC_MSG_ERROR([Couldn't find ffmpeg. You might need to install the libavcodec-dev and libswscale-dev pac...

...C_MSG_ERROR([Couldn't find mad.]) + AC_MSG_ERROR([Couldn't find mad. You might need to install the libmad0-dev package.]) fi else AC_MSG_WARN([*** mad audio support was not enabled. ***]) @@ -175,7 +175,7 @@ if test "$enable_ffmpeg" = "yes"; then if test "x$HAVE_FFMPEG" = xyes; then AC_DEFINE(HAVE_FFMPEG, 1, [Define if ffmpeg is enabled]) else - AC_MSG_ERROR([Couldn't find ffmpeg.]) + AC_MSG_ERROR([Couldn't find ffmpeg. You might need to install the libavcodec-dev package.]) fi else AC_MSG_WARN([*** ffmpeg support was not enabled. ***]...

...* (* func) (SwfdecAudioCodec, SwfdecAudioFormat); +} audio_codecs[] = { + { "builtin", swfdec_audio_decoder_builtin_new }, +#ifdef HAVE_MAD + { "mad", swfdec_audio_decoder_mad_new }, +#endif +#ifdef HAVE_GST + { "gst", swfdec_audio_decoder_gst_new }, +#endif +#ifdef HAVE_FFMPEG + { "ffmpeg", swfdec_audio_decoder_ffmpeg_new }, +#endif + { NULL, } +}; + /** * swfdec_audio_decoder_new: * @format: #SwfdecAudioCodec to decode @@ -122,24 +151,37 @@ SwfdecAudioDecoder * swfdec_audio_decoder_new (SwfdecAudioCodec codec, SwfdecAudioFormat format) { SwfdecAudi...

...GStreamer codecs It's disabled by default since it crashes far too often diff --git a/configure.ac b/configure.ac index fdf2a31..899cfef 100644 --- a/configure.ac +++ b/configure.ac @@ -204,6 +204,26 @@ else AC_MSG_WARN([*** ffmpeg support was not enabled. ***]) fi AM_CONDITIONAL(HAVE_FFMPEG, [test "x$HAVE_FFMPEG" = xyes]) +AC_ARG_ENABLE(gstreamer, + AS_HELP_STRING([--enable-gstreamer], + [enable GStreamer support (default=no)])], + enable_gstreamer=$enableval, + enable_gstreamer="no") + +if test "$enable_gstreamer" = "yes"; then + dnl I used m...

...uot;builtin", swfdec_audio_decoder_builtin_new }, -#ifdef HAVE_MAD - { "mad", swfdec_audio_decoder_mad_new }, -#endif #ifdef HAVE_GST { "gst", swfdec_audio_decoder_gst_new }, #endif +#ifdef HAVE_MAD + { "mad", swfdec_audio_decoder_mad_new }, +#endif #ifdef HAVE_FFMPEG { "ffmpeg", swfdec_audio_decoder_ffmpeg_new }, #endif diff --git a/libswfdec/swfdec_codec_video.c b/libswfdec/swfdec_codec_video.c index 93bc6dd..bfde110 100644 --- a/libswfdec/swfdec_codec_video.c +++ b/libswfdec/swfdec_codec_video.c @@ -44,12 +44,12 @@ struct { SwfdecVideoDecoder...

...;decoder); swfdec_audio_add (SWFDEC_AUDIO (stream), player); diff --git a/libswfdec/swfdec_codec.c b/libswfdec/swfdec_codec.c index 1875572..8affa1c 100644 --- a/libswfdec/swfdec_codec.c +++ b/libswfdec/swfdec_codec.c @@ -34,19 +34,17 @@ extern const SwfdecAudioCodec swfdec_cod #endif #ifdef HAVE_FFMPEG -extern const SwfdecAudioCodec swfdec_codec_ffmpeg_adpcm; -extern const SwfdecAudioCodec swfdec_codec_ffmpeg_mp3; -extern const SwfdecVideoCodec swfdec_codec_ffmpeg_h263; -extern const SwfdecVideoCodec swfdec_codec_ffmpeg_screen; +extern const SwfdecAudioCodec swfdec_codec_ffmpeg_audio; +extern con...

configure.ac | 1 + 1 files changed, 1 insertion(+) New commits: diff-tree fad705a672d2685cd5572f1bbe4fa9e17776441f (from 0e96b023aba5b5548d22679a5fdffcc0ebce13e5) Author: Benjamin Otte <otte at gnome.org> Date: Tue Jun 26 11:31:50 2007 +0200 automake claims we need this diff --git a/configure.ac b/configure.ac index aac8129..e76bce0 100644 --- a/configure.ac +++ b/configure.ac

...swfdec_codec.c @@ -27,7 +27,6 @@ /*** DECODER LIST ***/ extern const SwfdecAudioCodec swfdec_codec_adpcm; -extern const SwfdecVideoCodec swfdec_codec_screen; #ifdef HAVE_MAD extern const SwfdecAudioCodec swfdec_codec_mad; @@ -35,11 +34,8 @@ extern const SwfdecAudioCodec swfdec_cod #ifdef HAVE_FFMPEG extern const SwfdecAudioCodec swfdec_codec_ffmpeg_audio; -extern const SwfdecVideoCodec swfdec_codec_ffmpeg_video; #endif -extern const SwfdecVideoCodec swfdec_codec_gst_video; - /*** UNCOMPRESSED SOUND ***/ #define U8_FLAG (0x10000) @@ -144,38 +140,3 @@ swfdec_codec_get_audio (SwfdecAudioF...

...should be suitable for hooking in GStreamer diff --git a/libswfdec/Makefile.am b/libswfdec/Makefile.am index fa1abb6..352d46b 100644 --- a/libswfdec/Makefile.am +++ b/libswfdec/Makefile.am @@ -4,15 +4,15 @@ DIST_SUBDIRS = jpeg js CODECS = -if HAVE_MAD -CODECS += swfdec_codec_mad.c -endif if HAVE_FFMPEG CODECS += swfdec_codec_ffmpeg.c endif if HAVE_GST CODECS += swfdec_codec_gst.c endif +if HAVE_MAD +CODECS += swfdec_codec_mad.c +endif lib_LTLIBRARIES = libswfdec-@SWFDEC_MAJORMINOR@.la @@ -31,8 +31,8 @@ libswfdec_@SWFDEC_MAJORMINOR@_la_SOURCES swfdec_cache.c \ swfdec_cached.c \ swf...

...eg], - [enable ffmpeg support (default=yes)])], + [enable ffmpeg support (default=no)])], enable_ffmpeg=$enableval, - enable_ffmpeg="yes") + enable_ffmpeg="no") if test "$enable_ffmpeg" = "yes"; then PKG_CHECK_MODULES(FFMPEG, libavcodec libswscale, HAVE_FFMPEG=yes, HAVE_FFMPEG=no) commit 2aa0918b46d71707d1ca6f1ec22fd47de09bf23b Author: Benjamin Otte <otte at gnome.org> Date: Sun Oct 28 22:49:26 2007 +0100 only pop blocks when there's not been an error with the pc before diff --git a/libswfdec/swfdec_as_context.c b/libswfdec/swfdec_as_co...

...ibswfdec/Makefile.am index 07ca529..0c2e2a6 100644 --- a/libswfdec/Makefile.am +++ b/libswfdec/Makefile.am @@ -1,10 +1,5 @@ SUBDIRS = jpeg -noinst_PROGRAMS = compute-strings - -compute_strings_SOURCES = swfdec_as_strings.c -compute_strings_CFLAGS = -DCOMPUTE_SWFDEC_AS_STRINGS_H - CODECS = if HAVE_FFMPEG @@ -310,10 +305,17 @@ swfdec_enums.c: $(public_headers) Makefile --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ --vtail " { 0, NULL, NULL }\n };\n etype = g_ at type@_register_static (g_intern_static_string (\"@EnumNam...

...swscale, too diff --git a/configure.ac b/configure.ac index 1766eaf..f366094 100644 --- a/configure.ac +++ b/configure.ac @@ -196,7 +196,7 @@ AC_ARG_ENABLE(ffmpeg, enable_ffmpeg="yes") if test "$enable_ffmpeg" = "yes"; then - PKG_CHECK_MODULES(FFMPEG, libavcodec, HAVE_FFMPEG=yes, HAVE_FFMPEG=no) + PKG_CHECK_MODULES(FFMPEG, libavcodec libswscale, HAVE_FFMPEG=yes, HAVE_FFMPEG=no) AC_SUBST(FFMPEG_CFLAGS) AC_SUBST(FFMPEG_LIBS) if test "x$HAVE_FFMPEG" = xyes; then diff-tree 00d9cad4c135dba8df2cffea271d0ad5935440b1 (from 27f2f8fe232d392ddf50e97116724f507cc05a...

...ble_ffmpeg" = "yes"; then AC_MSG_ERROR([Couldn't find ffmpeg. You might need to install the libavcodec-dev and libswscale-dev packages.]) fi else - AC_MSG_WARN([*** ffmpeg support was not enabled. ***]) + AC_MSG_NOTICE([ffmpeg support was not enabled.]) fi AM_CONDITIONAL(HAVE_FFMPEG, [test "x$HAVE_FFMPEG" = xyes]) AC_ARG_ENABLE(gstreamer, @@ -243,7 +243,7 @@ if test "$enable_gstreamer" = "yes"; then AC_MSG_ERROR([Couldn't find GStreamer $GST_REQUIRED.]) fi else - AC_MSG_WARN([*** GStreamer support was not enabled. ***]) + AC_MSG_NOTICE...

...***/ @@ -106,22 +107,6 @@ swfdec_audio_decoder_uncompressed_new (S return &dec->decoder; } -/*** DECODER LIST ***/ - -extern SwfdecAudioDecoderNewFunc swfdec_audio_decoder_adpcm_new; - -#ifdef HAVE_MAD -extern SwfdecAudioDecoderNewFunc swfdec_audio_decoder_mad_new; -#endif - -#ifdef HAVE_FFMPEG -extern SwfdecAudioDecoderNewFunc swfdec_audio_decoder_ffmpeg_new; -#endif - -#ifdef HAVE_GST -extern SwfdecAudioDecoderNewFunc swfdec_audio_decoder_gst_new; -#endif - /*** PUBLIC API ***/ /** diff --git a/libswfdec/swfdec_codec_ffmpeg.c b/libswfdec/swfdec_codec_ffmpeg.c index c80f117..3f9e387...

...swfdec_audio_decoder_adpcm_new (guint type, SwfdecAudioFormat format); #ifdef HAVE_MAD -SwfdecAudioDecoder * swfdec_audio_decoder_mad_new (SwfdecAudioCodec type, +SwfdecAudioDecoder * swfdec_audio_decoder_mad_new (guint type, SwfdecAudioFormat format); #endif #ifdef HAVE_FFMPEG -SwfdecAudioDecoder * swfdec_audio_decoder_ffmpeg_new (SwfdecAudioCodec type, +SwfdecAudioDecoder * swfdec_audio_decoder_ffmpeg_new (guint type, SwfdecAudioFormat format); #endif #ifdef HAVE_GST -SwfdecAudioDecoder * swfdec_audio_decoder_gst_new (SwfdecAudioCodec type, +SwfdecAu...

...c_codec_audio.c b/libswfdec/swfdec_codec_audio.c index b5d00fb..9bd091c 100644 --- a/libswfdec/swfdec_codec_audio.c +++ b/libswfdec/swfdec_codec_audio.c @@ -118,6 +118,10 @@ extern SwfdecAudioDecoderNewFunc swfdec_ extern SwfdecAudioDecoderNewFunc swfdec_audio_decoder_ffmpeg_new; #endif +#ifdef HAVE_FFMPEG +extern SwfdecAudioDecoderNewFunc swfdec_audio_decoder_gst_new; +#endif + /*** PUBLIC API ***/ /** @@ -137,6 +141,7 @@ swfdec_audio_decoder_new (SwfdecAudioFor ret = swfdec_audio_decoder_uncompressed_new (format, width, data_format); if (ret == NULL) ret = swfdec_audio_decoder_adpcm_...

...tly using gnome-vfs but gnome-vfs somehow doesn't like to give me the file size. So I'll most likely switch to something else soon. diff --git a/configure.ac b/configure.ac index 65be1fc..aef0a9a 100644 --- a/configure.ac +++ b/configure.ac @@ -204,6 +204,25 @@ else fi AM_CONDITIONAL(HAVE_FFMPEG, [test "x$HAVE_FFMPEG" = xyes]) +AC_ARG_ENABLE(gnome-vfs, + AS_HELP_STRING([--enable-gnome-vfs], + [enable gnome-vfs support for swfdec-gtk (default=yes)])], + enable_gnomevfs=$enableval, + enable_gnomevfs="yes") + +if test "$enable_gnomevfs" = "yes"; the...

...tly using gnome-vfs but gnome-vfs somehow doesn't like to give me the file size. So I'll most likely switch to something else soon. diff --git a/configure.ac b/configure.ac index 65be1fc..aef0a9a 100644 --- a/configure.ac +++ b/configure.ac @@ -204,6 +204,25 @@ else fi AM_CONDITIONAL(HAVE_FFMPEG, [test "x$HAVE_FFMPEG" = xyes]) +AC_ARG_ENABLE(gnome-vfs, + AS_HELP_STRING([--enable-gnome-vfs], + [enable gnome-vfs support for swfdec-gtk (default=yes)])], + enable_gnomevfs=$enableval, + enable_gnomevfs="yes") + +if test "$enable_gnomevfs" = "yes"; the...

...c8bd3c9328b80bb3e78527fa845f011) Author: Benjamin Otte <otte@gnome.org> Date: Mon Mar 26 12:21:27 2007 +0200 s/SWF_(CFLAGS|LIBS)/SWFDEC_\1/ diff --git a/configure.ac b/configure.ac index d56afba..5ac3db0 100644 --- a/configure.ac +++ b/configure.ac @@ -202,10 +202,10 @@ AM_CONDITIONAL(HAVE_FFMPEG, [test "x$HAV AC_SUBST(GLOBAL_CFLAGS) -SWF_CFLAGS="$SWF_CFLAGS -I\$(top_srcdir) $GLIB_CFLAGS" -SWF_LIBS="$SWF_LIBS \$(top_builddir)/libswfdec/libswfdec-$SWFDEC_MAJORMINOR.la $MAD_LIBS $GLIB_LIBS -lz" -AC_SUBST(SWF_LIBS) -AC_SUBST(SWF_CFLAGS) +SWFDEC_CFLAGS="-I\$(t...