From 72b54f8e4ca57166326421a6d77fa66b2cbc7f5a Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Thu, 3 Apr 2008 09:32:46 +0000 Subject: [PATCH] ffmpegrev: Bump upstream ffmpeg revision to todays Original commit message from CVS: * ffmpegrev: Bump upstream ffmpeg revision to todays * configure.ac: Fix configure for build modification in upstream * ext/libpostproc/gstpostproc.c: (gst_post_proc_transform_ip): Fix build for modifications in upstream --- ChangeLog | 7 +++++++ common | 2 +- configure.ac | 4 +++- ext/libpostproc/gstpostproc.c | 9 +++++---- ffmpegrev | 2 +- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4d7a176..faaad44 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-04-03 Edward Hervey + + * ffmpegrev: Bump upstream ffmpeg revision to todays + * configure.ac: Fix configure for build modification in upstream + * ext/libpostproc/gstpostproc.c: (gst_post_proc_transform_ip): + Fix build for modifications in upstream + 2008-03-18 Andy Wingo * ext/ffmpeg/gstffmpegdec.c (gst_ffmpegdec_sink_event): Only drain diff --git a/common b/common index 170f8e9..fda6da5 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 170f8e91adc7157f6e708ffa58ca22d10e4e45da +Subproject commit fda6da5f2b9b000f7e1df8ffb44a6185ffd9799b diff --git a/configure.ac b/configure.ac index 8a7c266..82a37a8 100644 --- a/configure.ac +++ b/configure.ac @@ -254,6 +254,7 @@ else FFMPEG_CFLAGS="-I \$(top_srcdir)/gst-libs/ext/ffmpeg/libavformat \ -I \$(top_srcdir)/gst-libs/ext/ffmpeg/libavutil \ -I \$(top_srcdir)/gst-libs/ext/ffmpeg/libavcodec \ + -I \$(top_srcdir)/gst-libs/ext/ffmpeg \ -Wno-deprecated-declarations" dnl libgstffmpeg.la: libs to statically link to @@ -264,6 +265,7 @@ else POSTPROC_CFLAGS="-I \$(top_srcdir)/gst-libs/ext/ffmpeg/libpostproc \ -I \$(top_srcdir)/gst-libs/ext/ffmpeg/libavutil \ -I \$(top_srcdir)/gst-libs/ext/ffmpeg/libavcodec \ + -I \$(top_srcdir)/gst-libs/ext/ffmpeg \ -Wno-deprecated-declarations" dnl libgstpostproc.la: libs to statically link to @@ -273,7 +275,7 @@ else FFMPEG_SUBDIRS=gst-libs AC_DEFINE(HAVE_AVI_H) AC_DEFINE([FFMPEG_SOURCE], ["local snapshot"], [Describes where the FFmpeg libraries come from.]) - ac_configure_args="$ac_configure_args --disable-vhook --disable-ffserver --disable-ffplay --enable-pp --enable-gpl --enable-static --disable-encoder=flac --disable-decoder=cavs --extra-cflags=-fPIC" + ac_configure_args="$ac_configure_args --disable-vhook --disable-ffserver --disable-ffplay --enable-postproc --enable-gpl --enable-static --disable-encoder=flac --disable-decoder=cavs --extra-cflags=-fPIC" case $host_os in # Unfortunately, in Mac OS 10.5 the current rev of ffmpeg builds # some non-PIC code into the .a file. See diff --git a/ext/libpostproc/gstpostproc.c b/ext/libpostproc/gstpostproc.c index ec7fec8..9ad0af6 100644 --- a/ext/libpostproc/gstpostproc.c +++ b/ext/libpostproc/gstpostproc.c @@ -549,6 +549,7 @@ gst_post_proc_transform_ip (GstBaseTransform * btrans, GstBuffer * in) GstPostProc *postproc; gint stride[3]; guint8 *outplane[3]; + guint8 *inplane[3]; /* postprocess the buffer !*/ postproc = (GstPostProc *) btrans; @@ -556,14 +557,14 @@ gst_post_proc_transform_ip (GstBaseTransform * btrans, GstBuffer * in) stride[0] = postproc->ystride; stride[1] = postproc->ustride; stride[2] = postproc->vstride; - outplane[0] = GST_BUFFER_DATA (in); - outplane[1] = outplane[0] + postproc->ysize; - outplane[2] = outplane[1] + postproc->usize; + outplane[0] = inplane[0] = GST_BUFFER_DATA (in); + outplane[1] = inplane[1] = outplane[0] + postproc->ysize; + outplane[2] = inplane[2] = outplane[1] + postproc->usize; GST_DEBUG_OBJECT (postproc, "calling pp_postprocess, width:%d, height:%d", postproc->width, postproc->height); - pp_postprocess (outplane, stride, outplane, stride, + pp_postprocess ((const guint8**) inplane, (const int*) stride, outplane, stride, postproc->width, postproc->height, (int8_t*) "", 0, postproc->mode, postproc->context, 0); diff --git a/ffmpegrev b/ffmpegrev index 1810c9b..0883244 100644 --- a/ffmpegrev +++ b/ffmpegrev @@ -1,4 +1,4 @@ # 6315, 10844, 10876, 10910, 10932, 10939 -FFMPEG_REVISION=11247 +FFMPEG_REVISION=12672 FFMPEG_CO_DIR=gst-libs/ext/ffmpeg FFMPEG_SVN=svn://svn.mplayerhq.hu/ffmpeg/trunk -- 2.7.4