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

[stefano]

Author: stefano
Date: Tue Jul 27 18:17:15 2010
New Revision: 5872

Log:
Update to FFmpeg r24545 / libswscale r31782.

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 Jul 27 18:11:35 2010	(r5871)
+++ libavfilter/checkout.sh	Tue Jul 27 18:17:15 2010	(r5872)
@@ -1,11 +1,11 @@
 #! /bin/sh
 
 echo "checking out pristine ffmpeg"
-svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r24294
+svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r24545
 
 echo "downloading the corresponding version of swscale"
 cd ffmpeg/libswscale
-svn up -r31746
+svn up -r31782
 cd ../..
 
 echo "patching ffmpeg"

Modified: libavfilter/diffs/00_configure.diff
==============================================================================
--- libavfilter/diffs/00_configure.diff	Tue Jul 27 18:11:35 2010	(r5871)
+++ libavfilter/diffs/00_configure.diff	Tue Jul 27 18:17:15 2010	(r5872)
@@ -1,8 +1,8 @@
 Index: configure
 ===================================================================
---- configure	(revision 24294)
+--- configure	(revision 24545)
 +++ configure	(working copy)
-@@ -167,6 +167,7 @@
+@@ -168,6 +168,7 @@
                             and libraw1394 [no]
    --enable-libdirac        enable Dirac support via libdirac [no]
    --enable-libfaac         enable FAAC support via libfaac [no]
@@ -10,7 +10,7 @@ Index: configure
    --enable-libgsm          enable GSM support via libgsm [no]
    --enable-libmp3lame      enable MP3 encoding via libmp3lame [no]
    --enable-libnut          enable NUT (de)muxing via libnut,
-@@ -869,6 +870,7 @@
+@@ -872,6 +873,7 @@
      libdc1394
      libdirac
      libfaac
@@ -18,7 +18,7 @@ Index: configure
      libgsm
      libmp3lame
      libnut
-@@ -1010,6 +1012,7 @@
+@@ -1014,6 +1016,7 @@
      llrintf
      local_aligned_16
      local_aligned_8
@@ -26,7 +26,7 @@ Index: configure
      log2
      log2f
      loongson
-@@ -1376,6 +1379,7 @@
+@@ -1381,6 +1384,7 @@
  udp_protocol_deps="network"
  
  # filters
@@ -34,7 +34,7 @@ Index: configure
  movie_filter_deps="avfilter_lavf"
  avfilter_lavf_deps="avformat"
  
-@@ -2559,6 +2563,7 @@
+@@ -2579,6 +2583,7 @@
  check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss
  check_func  inet_aton $network_extralibs
  check_func  isatty
@@ -42,7 +42,7 @@ Index: configure
  check_func  ${malloc_prefix}memalign            && enable memalign
  check_func  mkstemp
  check_func  ${malloc_prefix}posix_memalign      && enable posix_memalign
-@@ -2641,6 +2646,7 @@
+@@ -2661,6 +2666,7 @@
                        require  libdirac libdirac_decoder/dirac_parser.h dirac_decoder_init $(pkg-config --libs dirac) &&
                        require  libdirac libdirac_encoder/dirac_encoder.h dirac_encoder_init $(pkg-config --libs dirac)
  enabled libfaac    && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac

Modified: libavfilter/diffs/01_build.diff
==============================================================================
--- libavfilter/diffs/01_build.diff	Tue Jul 27 18:11:35 2010	(r5871)
+++ libavfilter/diffs/01_build.diff	Tue Jul 27 18:17:15 2010	(r5872)
@@ -1,13 +1,13 @@
 Index: libavfilter/Makefile
 ===================================================================
---- libavfilter/Makefile	(revision 24294)
+--- libavfilter/Makefile	(revision 24545)
 +++ libavfilter/Makefile	(working copy)
 @@ -1,10 +1,11 @@
  include $(SUBDIR)../config.mak
  
  NAME = avfilter
--FFLIBS = avcodec avutil swscale
-+FFLIBS = avcodec avutil
+-FFLIBS = avcodec avcore avutil swscale
++FFLIBS = avcodec avcore avutil
 +FFLIBS-$(CONFIG_SCALE_FILTER)  += swscale
  FFLIBS-$(CONFIG_AVFILTER_LAVF) += avformat
  
@@ -51,7 +51,7 @@ Index: libavfilter/Makefile
  OBJS-$(CONFIG_NULLSINK_FILTER)               += vsink_nullsink.o
 Index: libavfilter/allfilters.c
 ===================================================================
---- libavfilter/allfilters.c	(revision 24294)
+--- libavfilter/allfilters.c	(revision 24545)
 +++ libavfilter/allfilters.c	(working copy)
 @@ -36,19 +36,32 @@
  

Modified: libavfilter/diffs/03_doc_filters.diff
==============================================================================
--- libavfilter/diffs/03_doc_filters.diff	Tue Jul 27 18:11:35 2010	(r5871)
+++ libavfilter/diffs/03_doc_filters.diff	Tue Jul 27 18:17:15 2010	(r5872)
@@ -1,6 +1,6 @@
 Index: doc/filters.texi
 ===================================================================
---- doc/filters.texi	(revision 24294)
+--- doc/filters.texi	(revision 24545)
 +++ doc/filters.texi	(working copy)
 @@ -39,6 +39,114 @@
  
@@ -265,19 +265,7 @@ Index: doc/filters.texi
  @section unsharp
  
  Sharpen or blur the input video.
-@@ -229,6 +450,11 @@
- 
- Below is a description of the currently available video sources.
- 
-+ at section buffer
-+
-+This input filter is used by the client application to feed pictures to
-+the filter chain. See ffmpeg.c for an usage example.
-+
- @section color
- 
- Provide an uniformly colored input.
-@@ -268,6 +494,27 @@
+@@ -308,6 +529,27 @@
  "color=red@@0.2:qcif:10 [color]; [in][color] overlay [out]"
  @end example