[FFmpeg-soc] [soc]: r5847 - in libavfilter: checkout.sh diffs/00_configure.diff diffs/03_doc_filters.diff vf_drawbox.c vf_drawtext.c

stefano subversion at mplayerhq.hu
Sun Jul 4 20:39:42 CEST 2010


Author: stefano
Date: Sun Jul  4 20:39:41 2010
New Revision: 5847

Log:
Update to FFmpeg r24040 / libswscale r31628.

Modified:
   libavfilter/checkout.sh
   libavfilter/diffs/00_configure.diff
   libavfilter/diffs/03_doc_filters.diff
   libavfilter/vf_drawbox.c
   libavfilter/vf_drawtext.c

Modified: libavfilter/checkout.sh
==============================================================================
--- libavfilter/checkout.sh	Thu Jul  1 01:27:39 2010	(r5846)
+++ libavfilter/checkout.sh	Sun Jul  4 20:39:41 2010	(r5847)
@@ -1,11 +1,11 @@
 #! /bin/sh
 
 echo "checking out pristine ffmpeg"
-svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r23745
+svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r24040
 
 echo "downloading the corresponding version of swscale"
 cd ffmpeg/libswscale
-svn up -r31301
+svn up -r31628
 cd ../..
 
 echo "patching ffmpeg"

Modified: libavfilter/diffs/00_configure.diff
==============================================================================
--- libavfilter/diffs/00_configure.diff	Thu Jul  1 01:27:39 2010	(r5846)
+++ libavfilter/diffs/00_configure.diff	Sun Jul  4 20:39:41 2010	(r5847)
@@ -1,6 +1,6 @@
 Index: configure
 ===================================================================
---- configure	(revision 23745)
+--- configure	(revision 24040)
 +++ 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,
-@@ -911,6 +912,7 @@
+@@ -860,6 +861,7 @@
      libdc1394
      libdirac
      libfaac
@@ -18,7 +18,7 @@ Index: configure
      libgsm
      libmp3lame
      libnut
-@@ -1050,6 +1052,7 @@
+@@ -1001,6 +1003,7 @@
      llrintf
      local_aligned_16
      local_aligned_8
@@ -26,7 +26,7 @@ Index: configure
      log2
      log2f
      loongson
-@@ -1412,6 +1415,7 @@
+@@ -1369,6 +1372,7 @@
  udp_protocol_deps="network"
  
  # filters
@@ -34,7 +34,7 @@ Index: configure
  movie_filter_deps="avfilter_lavf"
  avfilter_lavf_deps="avformat"
  
-@@ -2486,6 +2490,7 @@
+@@ -2461,6 +2465,7 @@
  check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss
  check_func  inet_aton $network_extralibs
  check_func  isatty
@@ -42,11 +42,11 @@ Index: configure
  check_func  ${malloc_prefix}memalign            && enable memalign
  check_func  mkstemp
  check_func  ${malloc_prefix}posix_memalign      && enable posix_memalign
-@@ -2568,6 +2573,7 @@
+@@ -2543,6 +2548,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
 +enabled libfreetype && add_cflags $(pkg-config --cflags freetype2) && require libfreetype ft2build.h FT_Init_FreeType -lfreetype -lz
  enabled libgsm     && require  libgsm gsm/gsm.h gsm_create -lgsm
- enabled libmp3lame && require  libmp3lame lame/lame.h lame_init -lmp3lame -lm
+ enabled libmp3lame && require  libmp3lame lame/lame.h lame_init -lmp3lame
  enabled libnut     && require  libnut libnut.h nut_demuxer_init -lnut

Modified: libavfilter/diffs/03_doc_filters.diff
==============================================================================
--- libavfilter/diffs/03_doc_filters.diff	Thu Jul  1 01:27:39 2010	(r5846)
+++ libavfilter/diffs/03_doc_filters.diff	Sun Jul  4 20:39:41 2010	(r5847)
@@ -1,6 +1,6 @@
 Index: doc/filters.texi
 ===================================================================
---- doc/filters.texi	(revision 23745)
+--- doc/filters.texi	(revision 24040)
 +++ doc/filters.texi	(working copy)
 @@ -39,6 +39,111 @@
  

Modified: libavfilter/vf_drawbox.c
==============================================================================
--- libavfilter/vf_drawbox.c	Thu Jul  1 01:27:39 2010	(r5846)
+++ libavfilter/vf_drawbox.c	Sun Jul  4 20:39:41 2010	(r5847)
@@ -27,7 +27,7 @@
 
 #include "avfilter.h"
 #include "parseutils.h"
-#include "libavcodec/colorspace.h"
+#include "libavutil/colorspace.h"
 
 typedef struct
 {

Modified: libavfilter/vf_drawtext.c
==============================================================================
--- libavfilter/vf_drawtext.c	Thu Jul  1 01:27:39 2010	(r5846)
+++ libavfilter/vf_drawtext.c	Sun Jul  4 20:39:41 2010	(r5847)
@@ -27,7 +27,7 @@
 
 #include "avfilter.h"
 #include "parseutils.h"
-#include "libavcodec/colorspace.h"
+#include "libavutil/colorspace.h"
 #include "libavutil/pixdesc.h"
 
 #undef time


More information about the FFmpeg-soc mailing list