Author: stefano Date: Mon Oct 19 01:55:41 2009 New Revision: 5417 Log: Update to FFmpeg r20303. Modified: libavfilter/checkout.sh libavfilter/diffs/01_ffplay_filters.diff libavfilter/diffs/02_ffmpeg_filters.diff libavfilter/diffs/03_vfilters_doc.diff libavfilter/vf_drawbox.c libavfilter/vf_hflip.c libavfilter/vf_negate.c libavfilter/vf_rotate.c libavfilter/vf_transpose.c libavfilter/vsrc_buffer.c libavfilter/vsrc_movie.c Modified: libavfilter/checkout.sh ============================================================================== --- libavfilter/checkout.sh Mon Oct 19 01:23:24 2009 (r5416) +++ libavfilter/checkout.sh Mon Oct 19 01:55:41 2009 (r5417) @@ -1,7 +1,7 @@ #! /bin/sh echo "checking out pristine ffmpeg" -svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20299 +svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20303 echo "downloading the corresponding version of swscale" cd ffmpeg/libswscale Modified: libavfilter/diffs/01_ffplay_filters.diff ============================================================================== --- libavfilter/diffs/01_ffplay_filters.diff Mon Oct 19 01:23:24 2009 (r5416) +++ libavfilter/diffs/01_ffplay_filters.diff Mon Oct 19 01:55:41 2009 (r5417) @@ -1,6 +1,6 @@ Index: ffplay.c =================================================================== ---- ffplay.c (revision 20299) +--- ffplay.c (revision 20303) +++ ffplay.c (working copy) @@ -29,6 +29,12 @@ #include "libavcodec/colorspace.h" @@ -310,7 +310,7 @@ Index: ffplay.c + priv->is->video_st->codec->pix_fmt, PIX_FMT_NONE + }; + -+ avfilter_set_common_formats(ctx, avfilter_make_format_list2(pix_fmts)); ++ avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts)); + return 0; +} + @@ -352,7 +352,7 @@ Index: ffplay.c +{ + enum PixelFormat pix_fmts[] = { PIX_FMT_YUV420P, PIX_FMT_NONE }; + -+ avfilter_set_common_formats(ctx, avfilter_make_format_list2(pix_fmts)); ++ avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts)); + return 0; +} + Modified: libavfilter/diffs/02_ffmpeg_filters.diff ============================================================================== --- libavfilter/diffs/02_ffmpeg_filters.diff Mon Oct 19 01:23:24 2009 (r5416) +++ libavfilter/diffs/02_ffmpeg_filters.diff Mon Oct 19 01:55:41 2009 (r5417) @@ -1,6 +1,6 @@ Index: ffmpeg.c =================================================================== ---- ffmpeg.c (revision 20299) +--- ffmpeg.c (revision 20303) +++ ffmpeg.c (working copy) @@ -41,6 +41,13 @@ #include "libavutil/avstring.h" @@ -71,7 +71,7 @@ Index: ffmpeg.c + FilterOutPriv *priv = ctx->priv; + enum PixelFormat pix_fmts[] = { priv->pix_fmt, PIX_FMT_NONE }; + -+ avfilter_set_common_formats(ctx, avfilter_make_format_list2(pix_fmts)); ++ avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts)); + return 0; +} + Modified: libavfilter/diffs/03_vfilters_doc.diff ============================================================================== --- libavfilter/diffs/03_vfilters_doc.diff Mon Oct 19 01:23:24 2009 (r5416) +++ libavfilter/diffs/03_vfilters_doc.diff Mon Oct 19 01:55:41 2009 (r5417) @@ -1,6 +1,6 @@ Index: doc/vfilters.texi =================================================================== ---- doc/vfilters.texi (revision 20299) +--- doc/vfilters.texi (revision 20303) +++ doc/vfilters.texi (working copy) @@ -80,8 +80,190 @@ Modified: libavfilter/vf_drawbox.c ============================================================================== --- libavfilter/vf_drawbox.c Mon Oct 19 01:23:24 2009 (r5416) +++ libavfilter/vf_drawbox.c Mon Oct 19 01:55:41 2009 (r5417) @@ -78,7 +78,7 @@ static int query_formats(AVFilterContext PIX_FMT_NONE }; - avfilter_set_common_formats(ctx, avfilter_make_format_list2(pix_fmts)); + avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts)); return 0; } Modified: libavfilter/vf_hflip.c ============================================================================== --- libavfilter/vf_hflip.c Mon Oct 19 01:23:24 2009 (r5416) +++ libavfilter/vf_hflip.c Mon Oct 19 01:55:41 2009 (r5417) @@ -37,7 +37,7 @@ static int query_formats(AVFilterContext PIX_FMT_NONE }; - avfilter_set_common_formats(ctx, avfilter_make_format_list2(pix_fmts)); + avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts)); return 0; } Modified: libavfilter/vf_negate.c ============================================================================== --- libavfilter/vf_negate.c Mon Oct 19 01:23:24 2009 (r5416) +++ libavfilter/vf_negate.c Mon Oct 19 01:55:41 2009 (r5417) @@ -38,7 +38,7 @@ static int query_formats(AVFilterContext PIX_FMT_NONE }; - avfilter_set_common_formats(ctx, avfilter_make_format_list2(pix_fmts)); + avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts)); return 0; } Modified: libavfilter/vf_rotate.c ============================================================================== --- libavfilter/vf_rotate.c Mon Oct 19 01:23:24 2009 (r5416) +++ libavfilter/vf_rotate.c Mon Oct 19 01:55:41 2009 (r5417) @@ -64,7 +64,7 @@ static int query_formats(AVFilterContext PIX_FMT_NONE }; - avfilter_set_common_formats(ctx, avfilter_make_format_list2(pix_fmts)); + avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts)); return 0; } Modified: libavfilter/vf_transpose.c ============================================================================== --- libavfilter/vf_transpose.c Mon Oct 19 01:23:24 2009 (r5416) +++ libavfilter/vf_transpose.c Mon Oct 19 01:55:41 2009 (r5417) @@ -52,7 +52,7 @@ static int query_formats(AVFilterContext PIX_FMT_NONE }; - avfilter_set_common_formats(ctx, avfilter_make_format_list2(pix_fmts)); + avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts)); return 0; } Modified: libavfilter/vsrc_buffer.c ============================================================================== --- libavfilter/vsrc_buffer.c Mon Oct 19 01:23:24 2009 (r5416) +++ libavfilter/vsrc_buffer.c Mon Oct 19 01:55:41 2009 (r5417) @@ -68,7 +68,7 @@ static int query_formats(AVFilterContext BufferSourceContext *c = ctx->priv; enum PixelFormat pix_fmts[] = { c->pix_fmt, PIX_FMT_NONE }; - avfilter_set_common_formats(ctx, avfilter_make_format_list2(pix_fmts)); + avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts)); return 0; } Modified: libavfilter/vsrc_movie.c ============================================================================== --- libavfilter/vsrc_movie.c Mon Oct 19 01:23:24 2009 (r5416) +++ libavfilter/vsrc_movie.c Mon Oct 19 01:55:41 2009 (r5417) @@ -151,7 +151,7 @@ static int query_formats(AVFilterContext MovieContext *mv = ctx->priv; enum PixelFormat pix_fmts[] = { mv->codec_ctx->pix_fmt, PIX_FMT_NONE }; - avfilter_set_common_formats(ctx, avfilter_make_format_list2(pix_fmts)); + avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts)); return 0; }