Author: stefano Date: Sat Oct 10 12:55:16 2009 New Revision: 5406 Log: Update to FFmpeg r20198. Modified: libavfilter/checkout.sh libavfilter/diffs/01_ffplay_filters.diff libavfilter/diffs/02_ffmpeg_filters.diff Modified: libavfilter/checkout.sh ============================================================================== --- libavfilter/checkout.sh Wed Sep 30 00:02:35 2009 (r5405) +++ libavfilter/checkout.sh Sat Oct 10 12:55:16 2009 (r5406) @@ -1,7 +1,7 @@ #! /bin/sh echo "checking out pristine ffmpeg" -svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20088 +svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20198 echo "downloading the corresponding version of swscale" cd ffmpeg/libswscale Modified: libavfilter/diffs/01_ffplay_filters.diff ============================================================================== --- libavfilter/diffs/01_ffplay_filters.diff Wed Sep 30 00:02:35 2009 (r5405) +++ libavfilter/diffs/01_ffplay_filters.diff Sat Oct 10 12:55:16 2009 (r5406) @@ -1,6 +1,6 @@ Index: ffplay.c =================================================================== ---- ffplay.c (revision 20088) +--- ffplay.c (revision 20198) +++ ffplay.c (working copy) @@ -29,6 +29,12 @@ #include "libavcodec/colorspace.h" @@ -551,7 +551,7 @@ Index: ffplay.c + { "vfilters", OPT_STRING | HAS_ARG, {(void*)&vfilters}, "video filters", "filter list" }, +#endif { "default", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" }, - { "loglevel", HAS_ARG | OPT_FUNC2, {(void*)opt_loglevel}, "set libav* logging level", "logging level number or string" }, + { "loglevel", HAS_ARG | OPT_FUNC2, {(void*)opt_loglevel}, "set libav* logging level", "loglevel" }, { NULL, }, @@ -2535,7 +2835,9 @@ avcodec_opts[i]= avcodec_alloc_context2(i); Modified: libavfilter/diffs/02_ffmpeg_filters.diff ============================================================================== --- libavfilter/diffs/02_ffmpeg_filters.diff Wed Sep 30 00:02:35 2009 (r5405) +++ libavfilter/diffs/02_ffmpeg_filters.diff Sat Oct 10 12:55:16 2009 (r5406) @@ -1,6 +1,6 @@ Index: ffmpeg.c =================================================================== ---- ffmpeg.c (revision 20088) +--- ffmpeg.c (revision 20198) +++ ffmpeg.c (working copy) @@ -41,6 +41,13 @@ #include "libavutil/avstring.h"