Author: stefano Date: Wed Mar 4 00:58:05 2009 New Revision: 4153 Log: Update to FFmpeg r17792. Modified: libavfilter/checkout.sh libavfilter/diffs/01_ffplay_filters.diff libavfilter/diffs/02_ffmpeg_filters.diff Modified: libavfilter/checkout.sh ============================================================================== --- libavfilter/checkout.sh Tue Mar 3 21:57:40 2009 (r4152) +++ libavfilter/checkout.sh Wed Mar 4 00:58:05 2009 (r4153) @@ -1,7 +1,7 @@ #! /bin/sh echo "checking out pristine ffmpeg" -svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r17547 +svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r17792 echo "patching ffmpeg" for diff in $(ls $(pwd)/diffs/*.diff); do patch -d ffmpeg -p0 -i $diff; done Modified: libavfilter/diffs/01_ffplay_filters.diff ============================================================================== --- libavfilter/diffs/01_ffplay_filters.diff Tue Mar 3 21:57:40 2009 (r4152) +++ libavfilter/diffs/01_ffplay_filters.diff Wed Mar 4 00:58:05 2009 (r4153) @@ -1,6 +1,6 @@ Index: ffplay.c =================================================================== ---- ffplay.c (revision 17547) +--- ffplay.c (revision 17789) +++ ffplay.c (working copy) @@ -29,6 +29,12 @@ #include "libavcodec/audioconvert.h" @@ -429,7 +429,7 @@ Index: ffplay.c + inputs->pad_idx = 0; + inputs->next = NULL; + -+ if (avfilter_parse_graph(graph, vfilters, inputs, outputs, NULL) < 0) ++ if (avfilter_graph_parse(graph, vfilters, inputs, outputs, NULL) < 0) + goto the_end; + } else { + if(avfilter_link(filt_src, 0, filt_out, 0) < 0) goto the_end; @@ -505,12 +505,12 @@ Index: ffplay.c } the_end: + #if CONFIG_AVFILTER -+ avfilter_destroy_graph(graph); ++ avfilter_graph_destroy(graph); + #endif av_free(frame); return 0; } -@@ -2189,6 +2473,12 @@ +@@ -2175,6 +2459,12 @@ /* free all pictures */ for(i=0;i<VIDEO_PICTURE_QUEUE_SIZE; i++) { vp = &is->pictq[i]; @@ -523,7 +523,7 @@ Index: ffplay.c if (vp->bmp) { SDL_FreeYUVOverlay(vp->bmp); vp->bmp = NULL; -@@ -2527,6 +2817,9 @@ +@@ -2513,6 +2803,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" }, @@ -533,8 +533,8 @@ Index: ffplay.c { "default", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" }, { NULL, }, }; -@@ -2575,7 +2868,9 @@ - avctx_opts[i]= avcodec_alloc_context2(i); +@@ -2561,7 +2854,9 @@ + avcodec_opts[i]= avcodec_alloc_context2(i); } avformat_opts = avformat_alloc_context(); +#if !CONFIG_AVFILTER Modified: libavfilter/diffs/02_ffmpeg_filters.diff ============================================================================== --- libavfilter/diffs/02_ffmpeg_filters.diff Tue Mar 3 21:57:40 2009 (r4152) +++ libavfilter/diffs/02_ffmpeg_filters.diff Wed Mar 4 00:58:05 2009 (r4153) @@ -1,8 +1,8 @@ Index: ffmpeg.c =================================================================== ---- ffmpeg.c (revision 17547) +--- ffmpeg.c (revision 17789) +++ ffmpeg.c (working copy) -@@ -41,6 +41,13 @@ +@@ -40,6 +40,13 @@ #include "libavutil/avstring.h" #include "libavformat/os_support.h" @@ -16,7 +16,7 @@ Index: ffmpeg.c #if HAVE_SYS_RESOURCE_H #include <sys/types.h> #include <sys/resource.h> -@@ -148,6 +155,9 @@ +@@ -147,6 +154,9 @@ static int loop_input = 0; static int loop_output = AVFMT_NOOUTPUTLOOP; static int qp_hist = 0; @@ -26,7 +26,7 @@ Index: ffmpeg.c static int intra_only = 0; static int audio_sample_rate = 44100; -@@ -286,6 +296,13 @@ +@@ -280,6 +290,13 @@ is not defined */ int64_t pts; /* current pts */ int is_start; /* is 1 at the start and after a discontinuity */ @@ -40,7 +40,7 @@ Index: ffmpeg.c } AVInputStream; typedef struct AVInputFile { -@@ -301,6 +318,183 @@ +@@ -295,6 +312,183 @@ static struct termios oldtty; #endif @@ -193,7 +193,7 @@ Index: ffmpeg.c + inputs->pad_idx = 0; + inputs->next = NULL; + -+ if (avfilter_parse_graph(filt_graph_all, vfilters, inputs, outputs, NULL) < 0) ++ if (avfilter_graph_parse(filt_graph_all, vfilters, inputs, outputs, NULL) < 0) + return -1; + } else { + if(avfilter_link(curr_filter, 0, ist->out_video_filter, 0) < 0) @@ -224,7 +224,7 @@ Index: ffmpeg.c static void term_exit(void) { #if HAVE_TERMIOS_H -@@ -886,6 +1080,9 @@ +@@ -879,6 +1073,9 @@ if (nb_frames <= 0) return; @@ -234,7 +234,7 @@ Index: ffmpeg.c if (ost->video_crop) { if (av_picture_crop((AVPicture *)&picture_crop_temp, (AVPicture *)in_picture, dec->pix_fmt, ost->topBand, ost->leftBand) < 0) { fprintf(stderr, "error cropping picture\n"); -@@ -897,6 +1094,7 @@ +@@ -890,6 +1087,7 @@ } else { formatted_picture = in_picture; } @@ -242,7 +242,7 @@ Index: ffmpeg.c final_picture = formatted_picture; padding_src = formatted_picture; -@@ -914,12 +1112,14 @@ +@@ -907,12 +1105,14 @@ } } @@ -257,7 +257,7 @@ Index: ffmpeg.c if (ost->video_pad) { av_picture_pad((AVPicture*)final_picture, (AVPicture *)padding_src, -@@ -1190,6 +1390,9 @@ +@@ -1183,6 +1383,9 @@ static short *samples= NULL; AVSubtitle subtitle, *subtitle_to_free; int got_subtitle; @@ -267,7 +267,7 @@ Index: ffmpeg.c if(ist->next_pts == AV_NOPTS_VALUE) ist->next_pts= ist->pts; -@@ -1307,6 +1510,15 @@ +@@ -1302,6 +1505,15 @@ &buffer_to_free); } @@ -283,7 +283,7 @@ Index: ffmpeg.c // preprocess audio (volume) if (ist->st->codec->codec_type == CODEC_TYPE_AUDIO) { if (audio_volume != 256) { -@@ -1328,10 +1540,18 @@ +@@ -1323,10 +1535,18 @@ if (pts > now) usleep(pts - now); } @@ -303,7 +303,7 @@ Index: ffmpeg.c for(i=0;i<nb_ostreams;i++) { int frame_size; -@@ -1354,6 +1574,9 @@ +@@ -1349,6 +1569,9 @@ do_audio_out(os, ost, ist, data_buf, data_size); break; case CODEC_TYPE_VIDEO: @@ -313,7 +313,7 @@ Index: ffmpeg.c do_video_out(os, ost, ist, &picture, &frame_size); if (vstats_filename && frame_size) do_video_stats(os, ost, frame_size); -@@ -1411,7 +1634,17 @@ +@@ -1406,7 +1629,17 @@ av_free_packet(&opkt); } } @@ -331,7 +331,7 @@ Index: ffmpeg.c av_free(buffer_to_free); /* XXX: allocate the subtitles in the codec ? */ if (subtitle_to_free) { -@@ -1842,10 +2075,21 @@ +@@ -1837,10 +2070,21 @@ fprintf(stderr, "Cannot get resampling context\n"); av_exit(1); } @@ -353,10 +353,10 @@ Index: ffmpeg.c break; case CODEC_TYPE_SUBTITLE: ost->encoding_needed = 1; -@@ -3835,6 +4079,9 @@ - #if CONFIG_VHOOK - { "vhook", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)add_frame_hooker}, "insert video processing module", "module" }, - #endif +@@ -3825,6 +4069,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" }, +#if CONFIG_AVFILTER + { "vfilters", OPT_STRING | HAS_ARG, {(void*)&vfilters}, "video filters", "filter list" }, +#endif