mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-03 05:05:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

ffmpegrev: Bump upstream ffmpeg revision to todays

Browse source 
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
This commit is contained in:
Edward Hervey 2008-04-03 09:32:46 +00:00
parent a5a03facd1
commit 72b54f8e4c
5 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2008-04-03 Edward Hervey <edward.hervey@collabora.co.uk>
* 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 <wingo@pobox.com>
* ext/ffmpeg/gstffmpegdec.c (gst_ffmpegdec_sink_event): Only drain

2
common

@ -1 +1 @@
Subproject commit 170f8e91adc7157f6e708ffa58ca22d10e4e45da
Subproject commit fda6da5f2b9b000f7e1df8ffb44a6185ffd9799b

4
configure.ac
View file

@ -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

9
ext/libpostproc/gstpostproc.c
View file

@ -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);

2
ffmpegrev
View file

@ -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