Author: stefano Date: Sat Jan 16 12:20:00 2010 New Revision: 5589 Log: Update to FFmpeg r21242 / libswscale r30317.
Modified: libavfilter/checkout.sh libavfilter/diffs/01_ffplay_filters.diff libavfilter/diffs/02_ffmpeg_filters.diff libavfilter/diffs/03_libavfilter_doc.diff Modified: libavfilter/checkout.sh ============================================================================== --- libavfilter/checkout.sh Fri Jan 15 10:36:07 2010 (r5588) +++ libavfilter/checkout.sh Sat Jan 16 12:20:00 2010 (r5589) @@ -1,11 +1,11 @@ #! /bin/sh echo "checking out pristine ffmpeg" -svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r21177 +svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r21242 echo "downloading the corresponding version of swscale" cd ffmpeg/libswscale -svn up -r30289 +svn up -r30317 cd ../.. echo "patching ffmpeg" Modified: libavfilter/diffs/01_ffplay_filters.diff ============================================================================== --- libavfilter/diffs/01_ffplay_filters.diff Fri Jan 15 10:36:07 2010 (r5588) +++ libavfilter/diffs/01_ffplay_filters.diff Sat Jan 16 12:20:00 2010 (r5589) @@ -1,6 +1,6 @@ Index: ffplay.c =================================================================== ---- ffplay.c (revision 21177) +--- ffplay.c (revision 21242) +++ ffplay.c (working copy) @@ -30,6 +30,12 @@ #include "libavcodec/colorspace.h" Modified: libavfilter/diffs/02_ffmpeg_filters.diff ============================================================================== --- libavfilter/diffs/02_ffmpeg_filters.diff Fri Jan 15 10:36:07 2010 (r5588) +++ libavfilter/diffs/02_ffmpeg_filters.diff Sat Jan 16 12:20:00 2010 (r5589) @@ -1,6 +1,6 @@ Index: ffmpeg.c =================================================================== ---- ffmpeg.c (revision 21177) +--- ffmpeg.c (revision 21242) +++ ffmpeg.c (working copy) @@ -41,6 +41,13 @@ #include "libavutil/avstring.h" Modified: libavfilter/diffs/03_libavfilter_doc.diff ============================================================================== --- libavfilter/diffs/03_libavfilter_doc.diff Fri Jan 15 10:36:07 2010 (r5588) +++ libavfilter/diffs/03_libavfilter_doc.diff Sat Jan 16 12:20:00 2010 (r5589) @@ -1,6 +1,6 @@ Index: doc/libavfilter.texi =================================================================== ---- doc/libavfilter.texi (revision 21177) +--- doc/libavfilter.texi (revision 21242) +++ doc/libavfilter.texi (working copy) @@ -111,6 +111,20 @@ @@ -137,14 +137,10 @@ Index: doc/libavfilter.texi @section vflip Flip the input video vertically. -@@ -197,4 +297,34 @@ - ./ffmpeg -i in.avi -vfilters "vflip" out.avi - @end example +@@ -201,6 +301,32 @@ + + Below is a description of the currently available video sources. -...@chapter Available video sources -+ -+Below is a description of the currently available video sources. -+ +...@section buffer + +This input filter is used by the client application to feed pictures to @@ -171,4 +167,6 @@ Index: doc/libavfilter.texi +ffmpeg -i in.avi -s 240x320 -vfilters "[in]setpts=PTS-STARTPTS, [T1]overlay=16:16[out]; movie=3200000:avi:in.avi, scale=180:144, setpts=PTS-STARTPTS[T1]" -y out.avi +...@end example + - @bye + @section nullsrc + + Null video source, never return images. It is mainly useful as a _______________________________________________ FFmpeg-soc mailing list [email protected] https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc
