[FFmpeg-soc] [soc]: r5942 - in libavfilter: checkout.sh diffs/00_configure.diff diffs/01_build.diff diffs/03_doc_filters.diff

[stefano]

Author: stefano
Date: Sat Nov 13 11:05:28 2010
New Revision: 5942

Log:
Update to FFmpeg r25741 / libswscale r32571.

Modified:
   libavfilter/checkout.sh
   libavfilter/diffs/00_configure.diff
   libavfilter/diffs/01_build.diff
   libavfilter/diffs/03_doc_filters.diff

Modified: libavfilter/checkout.sh
==============================================================================
--- libavfilter/checkout.sh	Tue Nov  2 23:59:33 2010	(r5941)
+++ libavfilter/checkout.sh	Sat Nov 13 11:05:28 2010	(r5942)
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 echo "checking out pristine ffmpeg"
-svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r25657
+svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r25741
 
 echo "downloading the corresponding version of swscale"
 cd ffmpeg/libswscale

Modified: libavfilter/diffs/00_configure.diff
==============================================================================
--- libavfilter/diffs/00_configure.diff	Tue Nov  2 23:59:33 2010	(r5941)
+++ libavfilter/diffs/00_configure.diff	Sat Nov 13 11:05:28 2010	(r5942)
@@ -1,6 +1,6 @@
 Index: configure
 ===================================================================
---- configure	(revision 25657)
+--- configure	(revision 25741)
 +++ configure	(working copy)
 @@ -170,6 +170,7 @@
                             and libraw1394 [no]

Modified: libavfilter/diffs/01_build.diff
==============================================================================
--- libavfilter/diffs/01_build.diff	Tue Nov  2 23:59:33 2010	(r5941)
+++ libavfilter/diffs/01_build.diff	Sat Nov 13 11:05:28 2010	(r5942)
@@ -1,18 +1,15 @@
 Index: libavfilter/Makefile
 ===================================================================
---- libavfilter/Makefile	(revision 25657)
+--- libavfilter/Makefile	(revision 25741)
 +++ libavfilter/Makefile	(working copy)
-@@ -3,8 +3,9 @@
+@@ -3,6 +3,7 @@
  NAME = avfilter
  FFLIBS = avcodec avcore avutil
  FFLIBS-$(CONFIG_SCALE_FILTER) += swscale
 +FFLIBS-$(CONFIG_MOVIE_FILTER) += avformat
  
--HEADERS = avfilter.h
-+HEADERS = avfilter.h avfiltergraph.h
+ HEADERS = avfilter.h avfiltergraph.h
  
- OBJS = allfilters.o                                                     \
-        avfilter.o                                                       \
 @@ -25,20 +26,27 @@
  OBJS-$(CONFIG_CROP_FILTER)                   += vf_crop.o
  OBJS-$(CONFIG_CROPDETECT_FILTER)             += vf_cropdetect.o
@@ -51,7 +48,7 @@ Index: libavfilter/Makefile
  OBJS-$(CONFIG_NULLSINK_FILTER)               += vsink_nullsink.o
 Index: libavfilter/allfilters.c
 ===================================================================
---- libavfilter/allfilters.c	(revision 25657)
+--- libavfilter/allfilters.c	(revision 25741)
 +++ libavfilter/allfilters.c	(working copy)
 @@ -45,20 +45,27 @@
      REGISTER_FILTER (CROP,        crop,        vf);

Modified: libavfilter/diffs/03_doc_filters.diff
==============================================================================
--- libavfilter/diffs/03_doc_filters.diff	Tue Nov  2 23:59:33 2010	(r5941)
+++ libavfilter/diffs/03_doc_filters.diff	Sat Nov 13 11:05:28 2010	(r5942)
@@ -1,6 +1,6 @@
 Index: doc/filters.texi
 ===================================================================
---- doc/filters.texi	(revision 25657)
+--- doc/filters.texi	(revision 25741)
 +++ doc/filters.texi	(working copy)
 @@ -257,6 +257,99 @@
  drawbox=10:20:200:60:red@@0.5"