Author: stefano Date: Sun Nov 29 19:14:47 2009 New Revision: 5472 Log: Update to FFmpeg r20660. 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 Sat Nov 28 04:28:03 2009 (r5471) +++ libavfilter/checkout.sh Sun Nov 29 19:14:47 2009 (r5472) @@ -1,11 +1,11 @@ #! /bin/sh echo "checking out pristine ffmpeg" -svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20520 +svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20660 echo "downloading the corresponding version of swscale" cd ffmpeg/libswscale -svn up -r29885 +svn up -r29968 cd ../.. echo "patching ffmpeg" Modified: libavfilter/diffs/01_ffplay_filters.diff ============================================================================== --- libavfilter/diffs/01_ffplay_filters.diff Sat Nov 28 04:28:03 2009 (r5471) +++ libavfilter/diffs/01_ffplay_filters.diff Sun Nov 29 19:14:47 2009 (r5472) @@ -1,6 +1,6 @@ Index: ffplay.c =================================================================== ---- ffplay.c (revision 20520) +--- ffplay.c (revision 20660) +++ ffplay.c (working copy) @@ -30,6 +30,12 @@ #include "libavcodec/colorspace.h" @@ -547,7 +547,7 @@ Index: ffplay.c if (show_status) printf("\n"); SDL_Quit(); -@@ -2487,6 +2788,9 @@ +@@ -2490,6 +2791,9 @@ { "ec", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&error_concealment}, "set error concealment options", "bit_mask" }, { "sync", HAS_ARG | OPT_FUNC2 | OPT_EXPERT, {(void*)opt_sync}, "set audio-video sync. type (type=audio/video/ext)", "type" }, { "threads", HAS_ARG | OPT_FUNC2 | OPT_EXPERT, {(void*)opt_thread_count}, "thread count", "count" }, @@ -557,7 +557,7 @@ Index: ffplay.c { "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", "loglevel" }, { NULL, }, -@@ -2536,7 +2840,9 @@ +@@ -2539,7 +2843,9 @@ avcodec_opts[i]= avcodec_alloc_context2(i); } avformat_opts = avformat_alloc_context(); Modified: libavfilter/diffs/02_ffmpeg_filters.diff ============================================================================== --- libavfilter/diffs/02_ffmpeg_filters.diff Sat Nov 28 04:28:03 2009 (r5471) +++ libavfilter/diffs/02_ffmpeg_filters.diff Sun Nov 29 19:14:47 2009 (r5472) @@ -1,6 +1,6 @@ Index: ffmpeg.c =================================================================== ---- ffmpeg.c (revision 20520) +--- ffmpeg.c (revision 20660) +++ ffmpeg.c (working copy) @@ -41,6 +41,13 @@ #include "libavutil/avstring.h" @@ -399,7 +399,7 @@ Index: ffmpeg.c /* finished ! */ ret = 0; -@@ -3899,6 +4160,9 @@ +@@ -3898,6 +4159,9 @@ { "psnr", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_psnr}, "calculate PSNR of compressed frames" }, { "vstats", OPT_EXPERT | OPT_VIDEO, {(void*)&opt_vstats}, "dump video coding statistics to file" }, { "vstats_file", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_vstats_file}, "dump video coding statistics to file", "file" }, Modified: libavfilter/diffs/03_libavfilter_doc.diff ============================================================================== --- libavfilter/diffs/03_libavfilter_doc.diff Sat Nov 28 04:28:03 2009 (r5471) +++ libavfilter/diffs/03_libavfilter_doc.diff Sun Nov 29 19:14:47 2009 (r5472) @@ -1,6 +1,6 @@ Index: doc/libavfilter.texi =================================================================== ---- doc/libavfilter.texi (revision 20520) +--- doc/libavfilter.texi (revision 20660) +++ doc/libavfilter.texi (working copy) @@ -111,6 +111,20 @@