[FFmpeg-soc] [soc]: r5862 - in libavfilter: Makefile allfilters.c checkout.sh diffs/00_configure.diff diffs/03_doc_filters.diff

stefano subversion at mplayerhq.hu
Sat Jul 17 22:16:21 CEST 2010


Author: stefano
Date: Sat Jul 17 22:16:21 2010
New Revision: 5862

Log:
Update to FFmpeg r24294 / libswscale r31746.

Modified:
   libavfilter/Makefile
   libavfilter/allfilters.c
   libavfilter/checkout.sh
   libavfilter/diffs/00_configure.diff
   libavfilter/diffs/03_doc_filters.diff

Modified: libavfilter/Makefile
==============================================================================
--- libavfilter/Makefile	Thu Jul 15 18:34:29 2010	(r5861)
+++ libavfilter/Makefile	Sat Jul 17 22:16:21 2010	(r5862)
@@ -29,6 +29,7 @@ OBJS-$(CONFIG_NOFORMAT_FILTER)          
 OBJS-$(CONFIG_NULL_FILTER)                   += vf_null.o
 OBJS-$(CONFIG_OVERLAY_FILTER)                += vf_overlay.o
 OBJS-$(CONFIG_PAD_FILTER)                    += vf_pad.o
+OBJS-$(CONFIG_PIXDESCTEST_FILTER)            += vf_pixdesctest.o
 OBJS-$(CONFIG_PIXELASPECT_FILTER)            += vf_aspect.o
 OBJS-$(CONFIG_ROTATE_FILTER)                 += vf_rotate.o
 OBJS-$(CONFIG_SCALE_FILTER)                  += vf_scale.o
@@ -40,6 +41,7 @@ OBJS-$(CONFIG_UNSHARP_FILTER)           
 OBJS-$(CONFIG_VFLIP_FILTER)                  += vf_vflip.o
 
 OBJS-$(CONFIG_BUFFER_FILTER)                 += vsrc_buffer.o
+OBJS-$(CONFIG_COLOR_FILTER)                  += vf_pad.o
 OBJS-$(CONFIG_MOVIE_FILTER)                  += vsrc_movie.o
 OBJS-$(CONFIG_NULLSRC_FILTER)                += vsrc_nullsrc.o
 

Modified: libavfilter/allfilters.c
==============================================================================
--- libavfilter/allfilters.c	Thu Jul 15 18:34:29 2010	(r5861)
+++ libavfilter/allfilters.c	Sat Jul 17 22:16:21 2010	(r5862)
@@ -48,6 +48,7 @@ void avfilter_register_all(void)
     REGISTER_FILTER (NULL,        null,        vf);
     REGISTER_FILTER (OVERLAY,     overlay,     vf);
     REGISTER_FILTER (PAD,         pad,         vf);
+    REGISTER_FILTER (PIXDESCTEST, pixdesctest, vf);
     REGISTER_FILTER (PIXELASPECT, pixelaspect, vf);
     REGISTER_FILTER (ROTATE,      rotate,      vf);
     REGISTER_FILTER (SCALE,       scale,       vf);
@@ -59,6 +60,7 @@ void avfilter_register_all(void)
     REGISTER_FILTER (VFLIP,       vflip,       vf);
 
     REGISTER_FILTER (BUFFER,      buffer,      vsrc);
+    REGISTER_FILTER (COLOR,       color,       vsrc);
     REGISTER_FILTER (MOVIE,       movie,       vsrc);
     REGISTER_FILTER (NULLSRC,     nullsrc,     vsrc);
 

Modified: libavfilter/checkout.sh
==============================================================================
--- libavfilter/checkout.sh	Thu Jul 15 18:34:29 2010	(r5861)
+++ libavfilter/checkout.sh	Sat Jul 17 22:16:21 2010	(r5862)
@@ -1,11 +1,11 @@
 #! /bin/sh
 
 echo "checking out pristine ffmpeg"
-svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r24040
+svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r24294
 
 echo "downloading the corresponding version of swscale"
 cd ffmpeg/libswscale
-svn up -r31628
+svn up -r31746
 cd ../..
 
 echo "patching ffmpeg"

Modified: libavfilter/diffs/00_configure.diff
==============================================================================
--- libavfilter/diffs/00_configure.diff	Thu Jul 15 18:34:29 2010	(r5861)
+++ libavfilter/diffs/00_configure.diff	Sat Jul 17 22:16:21 2010	(r5862)
@@ -1,6 +1,6 @@
 Index: configure
 ===================================================================
---- configure	(revision 24040)
+--- configure	(revision 24294)
 +++ configure	(working copy)
 @@ -167,6 +167,7 @@
                             and libraw1394 [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,
-@@ -860,6 +861,7 @@
+@@ -869,6 +870,7 @@
      libdc1394
      libdirac
      libfaac
@@ -18,7 +18,7 @@ Index: configure
      libgsm
      libmp3lame
      libnut
-@@ -1001,6 +1003,7 @@
+@@ -1010,6 +1012,7 @@
      llrintf
      local_aligned_16
      local_aligned_8
@@ -26,7 +26,7 @@ Index: configure
      log2
      log2f
      loongson
-@@ -1369,6 +1372,7 @@
+@@ -1376,6 +1379,7 @@
  udp_protocol_deps="network"
  
  # filters
@@ -34,7 +34,7 @@ Index: configure
  movie_filter_deps="avfilter_lavf"
  avfilter_lavf_deps="avformat"
  
-@@ -2461,6 +2465,7 @@
+@@ -2559,6 +2563,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
-@@ -2543,6 +2548,7 @@
+@@ -2641,6 +2646,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/03_doc_filters.diff
==============================================================================
--- libavfilter/diffs/03_doc_filters.diff	Thu Jul 15 18:34:29 2010	(r5861)
+++ libavfilter/diffs/03_doc_filters.diff	Sat Jul 17 22:16:21 2010	(r5862)
@@ -1,6 +1,6 @@
 Index: doc/filters.texi
 ===================================================================
---- doc/filters.texi	(revision 24040)
+--- doc/filters.texi	(revision 24294)
 +++ doc/filters.texi	(working copy)
 @@ -39,6 +39,114 @@
  
@@ -205,9 +205,9 @@ Index: doc/filters.texi
  @section pad
  
  Add paddings to the input image, and places the original input at the
-@@ -112,6 +294,14 @@
+@@ -124,6 +306,14 @@
  
- @end table
+ can be used to test the monowhite pixel format descriptor definition.
  
 + at section rotate
 +
@@ -220,7 +220,7 @@ Index: doc/filters.texi
  @section scale
  
  Scale the input video to @var{width}:@var{height} and/or convert the image format.
-@@ -137,6 +327,24 @@
+@@ -149,6 +339,24 @@
  
  The default value of @var{width} and @var{height} is 0.
  
@@ -245,7 +245,7 @@ Index: doc/filters.texi
  @section slicify
  
  Pass the images of input video on to next video filter as multiple
-@@ -152,6 +360,19 @@
+@@ -164,6 +372,19 @@
  Adding this in the beginning of filter chains should make filtering
  faster due to better use of the memory cache.
  
@@ -265,7 +265,7 @@ Index: doc/filters.texi
  @section unsharp
  
  Sharpen or blur the input video.
-@@ -217,6 +438,32 @@
+@@ -229,6 +450,11 @@
  
  Below is a description of the currently available video sources.
  
@@ -274,6 +274,13 @@ Index: doc/filters.texi
 +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 @@
+ "color=red@@0.2:qcif:10 [color]; [in][color] overlay [out]"
+ @end example
+ 
 + at section movie
 +
 +The parameters of the movie filter are


More information about the FFmpeg-soc mailing list