Author: stefano Date: Sat Sep 25 23:33:19 2010 New Revision: 5934 Log: Update to FFmpeg r25200 / libswscale r32265. 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 Sep 14 15:59:07 2010 (r5933) +++ libavfilter/checkout.sh Sat Sep 25 23:33:19 2010 (r5934) @@ -1,11 +1,11 @@ #! /bin/sh echo "checking out pristine ffmpeg" -svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r25118 +svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r25200 echo "downloading the corresponding version of swscale" cd ffmpeg/libswscale -svn up -r32241 +svn up -r32265 cd ../.. echo "patching ffmpeg" Modified: libavfilter/diffs/00_configure.diff ============================================================================== --- libavfilter/diffs/00_configure.diff Tue Sep 14 15:59:07 2010 (r5933) +++ libavfilter/diffs/00_configure.diff Sat Sep 25 23:33:19 2010 (r5934) @@ -1,8 +1,8 @@ Index: configure =================================================================== ---- configure (revision 25118) +--- configure (revision 25200) +++ configure (working copy) -@@ -169,6 +169,7 @@ +@@ -170,6 +170,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, -@@ -883,6 +884,7 @@ +@@ -885,6 +886,7 @@ libdc1394 libdirac libfaac @@ -18,7 +18,7 @@ Index: configure libgsm libmp3lame libnut -@@ -1026,6 +1028,7 @@ +@@ -1029,6 +1031,7 @@ llrintf local_aligned_16 local_aligned_8 @@ -26,16 +26,16 @@ Index: configure log2 log2f loongson -@@ -1393,6 +1396,8 @@ +@@ -1401,6 +1404,8 @@ udp_protocol_deps="network" # filters +drawtext_filter_deps="libfreetype" +movie_filter_deps="avformat" ocv_smooth_filter_deps="libopencv" + yadif_filter_deps="gpl" - # libraries -@@ -2631,6 +2636,7 @@ +@@ -2649,6 +2654,7 @@ check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss check_func inet_aton $network_extralibs check_func isatty @@ -43,11 +43,11 @@ Index: configure check_func ${malloc_prefix}memalign && enable memalign check_func mkstemp check_func ${malloc_prefix}posix_memalign && enable posix_memalign -@@ -2713,6 +2719,7 @@ +@@ -2733,6 +2739,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 + enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h hip_decode_init -lmp3lame enabled libnut && require libnut libnut.h nut_demuxer_init -lnut Modified: libavfilter/diffs/01_build.diff ============================================================================== --- libavfilter/diffs/01_build.diff Tue Sep 14 15:59:07 2010 (r5933) +++ libavfilter/diffs/01_build.diff Sat Sep 25 23:33:19 2010 (r5934) @@ -1,6 +1,6 @@ Index: libavfilter/Makefile =================================================================== ---- libavfilter/Makefile (revision 25118) +--- libavfilter/Makefile (revision 25200) +++ libavfilter/Makefile (working copy) @@ -3,8 +3,9 @@ NAME = avfilter @@ -13,7 +13,7 @@ Index: libavfilter/Makefile OBJS = allfilters.o \ avfilter.o \ -@@ -18,22 +19,33 @@ +@@ -22,18 +23,28 @@ OBJS-$(CONFIG_ASPECT_FILTER) += vf_aspect.o OBJS-$(CONFIG_CROP_FILTER) += vf_crop.o @@ -22,6 +22,7 @@ Index: libavfilter/Makefile +OBJS-$(CONFIG_FADE_FILTER) += vf_fade.o OBJS-$(CONFIG_FIFO_FILTER) += vf_fifo.o OBJS-$(CONFIG_FORMAT_FILTER) += vf_format.o + OBJS-$(CONFIG_FREI0R_FILTER) += vf_frei0r.o +OBJS-$(CONFIG_FPS_FILTER) += vf_fps.o OBJS-$(CONFIG_HFLIP_FILTER) += vf_hflip.o +OBJS-$(CONFIG_NEGATE_FILTER) += vf_negate.o @@ -40,6 +41,8 @@ Index: libavfilter/Makefile +OBJS-$(CONFIG_TRANSPOSE_FILTER) += vf_transpose.o OBJS-$(CONFIG_UNSHARP_FILTER) += vf_unsharp.o OBJS-$(CONFIG_VFLIP_FILTER) += vf_vflip.o + OBJS-$(CONFIG_YADIF_FILTER) += vf_yadif.o +@@ -42,6 +53,7 @@ OBJS-$(CONFIG_BUFFER_FILTER) += vsrc_buffer.o OBJS-$(CONFIG_COLOR_FILTER) += vf_pad.o @@ -49,9 +52,9 @@ Index: libavfilter/Makefile OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o Index: libavfilter/allfilters.c =================================================================== ---- libavfilter/allfilters.c (revision 25118) +--- libavfilter/allfilters.c (revision 25200) +++ libavfilter/allfilters.c (working copy) -@@ -38,22 +38,33 @@ +@@ -42,24 +42,35 @@ REGISTER_FILTER (ASPECT, aspect, vf); REGISTER_FILTER (CROP, crop, vf); @@ -60,6 +63,7 @@ Index: libavfilter/allfilters.c + REGISTER_FILTER (FADE, fade, vf); REGISTER_FILTER (FIFO, fifo, vf); REGISTER_FILTER (FORMAT, format, vf); + REGISTER_FILTER (FREI0R, frei0r, vf); + REGISTER_FILTER (FPS, fps, vf); REGISTER_FILTER (HFLIP, hflip, vf); + REGISTER_FILTER (NEGATE, negate, vf); @@ -78,6 +82,7 @@ Index: libavfilter/allfilters.c + REGISTER_FILTER (TRANSPOSE, transpose, vf); REGISTER_FILTER (UNSHARP, unsharp, vf); REGISTER_FILTER (VFLIP, vflip, vf); + REGISTER_FILTER (YADIF, yadif, vf); REGISTER_FILTER (BUFFER, buffer, vsrc); REGISTER_FILTER (COLOR, color, vsrc); Modified: libavfilter/diffs/03_doc_filters.diff ============================================================================== --- libavfilter/diffs/03_doc_filters.diff Tue Sep 14 15:59:07 2010 (r5933) +++ libavfilter/diffs/03_doc_filters.diff Sat Sep 25 23:33:19 2010 (r5934) @@ -1,10 +1,10 @@ Index: doc/filters.texi =================================================================== ---- doc/filters.texi (revision 25118) +--- doc/filters.texi (revision 25200) +++ doc/filters.texi (working copy) -@@ -55,6 +55,108 @@ - - The default value of @var{width} and @var{height} is 0. +@@ -169,6 +169,108 @@ + "crop=in_w/2:in_h/2:y:10+10*sin(n/10)" + @end example +@section drawbox + @@ -111,9 +111,9 @@ Index: doc/filters.texi @section fifo Buffer input images and send them when they are requested. -@@ -81,6 +183,14 @@ - - will convert the input video to the format ``yuv420p''. +@@ -245,6 +347,14 @@ + For more information see: + @url{http://piksel.org/frei0r} +@section fps + @@ -126,7 +126,7 @@ Index: doc/filters.texi @section hflip Flip the input video horizontally. -@@ -91,6 +201,14 @@ +@@ -255,6 +365,14 @@ ffmpeg -i in.avi -vf "hflip" out.avi @end example @@ -141,7 +141,7 @@ Index: doc/filters.texi @section noformat Force libavfilter not to use any of the specified pixel formats for the -@@ -139,6 +257,56 @@ +@@ -303,6 +421,56 @@ documentation for the exact meaning of the parameters: @url{http://opencv.willowgarage.com/documentation/c/image_filtering.html} @@ -198,7 +198,7 @@ Index: doc/filters.texi @section pad Add paddings to the input image, and places the original input at the -@@ -186,6 +354,14 @@ +@@ -350,6 +518,14 @@ can be used to test the monowhite pixel format descriptor definition. @@ -213,7 +213,7 @@ Index: doc/filters.texi @section scale Scale the input video to @var{width}:@var{height} and/or convert the image format. -@@ -211,6 +387,24 @@ +@@ -375,6 +551,24 @@ The default value of @var{width} and @var{height} is 0. @@ -238,7 +238,7 @@ Index: doc/filters.texi @section slicify Pass the images of input video on to next video filter as multiple -@@ -226,6 +420,19 @@ +@@ -390,6 +584,19 @@ Adding this in the beginning of filter chains should make filtering faster due to better use of the memory cache. @@ -258,7 +258,7 @@ Index: doc/filters.texi @section unsharp Sharpen or blur the input video. -@@ -370,6 +577,27 @@ +@@ -564,6 +771,27 @@ "color=red@@0.2:qcif:10 [color]; [in][color] overlay [out]" @end example