Benjamin Otte
2007-Jun-26 11:35 UTC
[Swfdec] 2 commits - configure.ac libswfdec/swfdec_codec_ffmpeg.c
configure.ac | 2 +- libswfdec/swfdec_codec_ffmpeg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: diff-tree 5cdaada235a5bf34316aa5faa3a3b4fc1d2b515c (from 00d9cad4c135dba8df2cffea271d0ad5935440b1) Author: Benjamin Otte <otte at gnome.org> Date: Tue Jun 26 13:35:15 2007 +0200 Check for libswscale, 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 27f2f8fe232d392ddf50e97116724f507cc05a43) Author: Benjamin Otte <otte at gnome.org> Date: Tue Jun 26 13:35:01 2007 +0200 initialize the struct with 0ed members Avoids SEGV when assuming the swscaler context is empty. diff --git a/libswfdec/swfdec_codec_ffmpeg.c b/libswfdec/swfdec_codec_ffmpeg.c index 8b7463c..c80f117 100644 --- a/libswfdec/swfdec_codec_ffmpeg.c +++ b/libswfdec/swfdec_codec_ffmpeg.c @@ -280,7 +280,7 @@ swfdec_video_decoder_ffmpeg_new (SwfdecV if (ctx == NULL) return NULL; - codec = g_new (SwfdecVideoDecoderFFMpeg, 1); + codec = g_new0 (SwfdecVideoDecoderFFMpeg, 1); codec->decoder.decode = swfdec_video_decoder_ffmpeg_decode; codec->decoder.free = swfdec_video_decoder_ffmpeg_free; codec->ctx = ctx;