Author: stefano Date: Wed Jan 13 01:39:25 2010 New Revision: 5574 Log: Update to FFmpeg r21177 / libswscale r30289.
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 Tue Jan 12 01:20:15 2010 (r5573) +++ libavfilter/checkout.sh Wed Jan 13 01:39:25 2010 (r5574) @@ -1,11 +1,11 @@ #! /bin/sh echo "checking out pristine ffmpeg" -svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r21105 +svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r21177 echo "downloading the corresponding version of swscale" cd ffmpeg/libswscale -svn up -r30246 +svn up -r30289 cd ../.. echo "patching ffmpeg" Modified: libavfilter/diffs/01_ffplay_filters.diff ============================================================================== --- libavfilter/diffs/01_ffplay_filters.diff Tue Jan 12 01:20:15 2010 (r5573) +++ libavfilter/diffs/01_ffplay_filters.diff Wed Jan 13 01:39:25 2010 (r5574) @@ -1,6 +1,6 @@ Index: ffplay.c =================================================================== ---- ffplay.c (revision 21105) +--- ffplay.c (revision 21177) +++ ffplay.c (working copy) @@ -30,6 +30,12 @@ #include "libavcodec/colorspace.h" @@ -438,7 +438,7 @@ Index: ffplay.c + avfilter_graph_add_filter(graph, filt_out); + + if(avfilter_graph_check_validity(graph, NULL)) goto the_end; -+ if(avfilter_graph_config_formats(graph)) goto the_end; ++ if(avfilter_graph_config_formats(graph, NULL)) goto the_end; + if(avfilter_graph_config_links(graph, NULL)) goto the_end; + + is->out_video_filter = filt_out; Modified: libavfilter/diffs/02_ffmpeg_filters.diff ============================================================================== --- libavfilter/diffs/02_ffmpeg_filters.diff Tue Jan 12 01:20:15 2010 (r5573) +++ libavfilter/diffs/02_ffmpeg_filters.diff Wed Jan 13 01:39:25 2010 (r5574) @@ -1,6 +1,6 @@ Index: ffmpeg.c =================================================================== ---- ffmpeg.c (revision 21105) +--- ffmpeg.c (revision 21177) +++ ffmpeg.c (working copy) @@ -41,6 +41,13 @@ #include "libavutil/avstring.h" @@ -211,7 +211,7 @@ Index: ffmpeg.c + /* configure all the filter links */ + if(avfilter_graph_check_validity(filt_graph_all, NULL)) + return -1; -+ if(avfilter_graph_config_formats(filt_graph_all)) ++ if(avfilter_graph_config_formats(filt_graph_all, NULL)) + return -1; + if(avfilter_graph_config_links(filt_graph_all, NULL)) + return -1; Modified: libavfilter/diffs/03_libavfilter_doc.diff ============================================================================== --- libavfilter/diffs/03_libavfilter_doc.diff Tue Jan 12 01:20:15 2010 (r5573) +++ libavfilter/diffs/03_libavfilter_doc.diff Wed Jan 13 01:39:25 2010 (r5574) @@ -1,6 +1,6 @@ Index: doc/libavfilter.texi =================================================================== ---- doc/libavfilter.texi (revision 21105) +--- doc/libavfilter.texi (revision 21177) +++ doc/libavfilter.texi (working copy) @@ -111,6 +111,20 @@ _______________________________________________ FFmpeg-soc mailing list FFmpeg-soc@mplayerhq.hu https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc
