Merge branch 'master' of git://git.videolan.org/ffmpeg

Conflicts:
	libavfilter/Makefile

diff --cc ffmpeg.c
index 02eba04,2a1ee79..03c6c8d
--- 1/ffmpeg.c
--- 2/ffmpeg.c
+++ b/ffmpeg.c
@@@ -50,8 -52,8 +52,9 @@@
  # include "libavfilter/avcodec.h"
  # include "libavfilter/avfilter.h"
  # include "libavfilter/avfiltergraph.h"
+ # include "libavfilter/vsink_buffer.h"
  # include "libavfilter/vsrc_buffer.h"
 +# include "libavfilter/avtool.h"
  #endif
  
  #if HAVE_SYS_RESOURCE_H
@@@ -2306,8 -2352,20 +2353,21 @@@ static int transcode(AVFormatContext **
                  ost->encoding_needed = 1;
                  ist->decoding_needed = 1;
  
+                 if (!ost->frame_rate.num)
+                     ost->frame_rate = ist->st->r_frame_rate.num ? ist->st->r_frame_rate : (AVRational){25,1};
+                 if (ost->enc && ost->enc->supported_framerates && !force_fps) {
+                     int idx = av_find_nearest_q_idx(ost->frame_rate, ost->enc->supported_framerates);
+                     ost->frame_rate = ost->enc->supported_framerates[idx];
+                 }
+                 codec->time_base = (AVRational){ost->frame_rate.den, ost->frame_rate.num};
+                 if(   av_q2d(codec->time_base) < 0.001 && video_sync_method
+                    && (video_sync_method==1 || (video_sync_method<0 && !(os->oformat->flags & AVFMT_VARIABLE_FPS)))){
+                     av_log(os, AV_LOG_WARNING, "Frame rate very high for a muxer not effciciently supporting it.\n"
+                                                "Please consider specifiying a lower framerate, a different muxer or -vsync 2\n");
+                 }
+ 
  #if CONFIG_AVFILTER
 +                tool_registerInfo(is, recording_time);
                  if (configure_video_filters(ist, ost)) {
                      fprintf(stderr, "Error opening filters!\n");
                      exit(1);

diff --cc libavfilter/Makefile
index 55a7ae6,6007fed..fad67a7
--- 1/libavfilter/Makefile
--- 2/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@@ -128,8 -134,8 +134,11 @@@ OBJS-$(CONFIG_MP_FILTER) += libmpcodecs
  OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_yvu9.o
  OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/pullup.o
  
++OBJS-$(CONFIG_VHEXT_FILTER)                  += avtool.o
++OBJS-$(CONFIG_VHEXT_FILTER)                  += vf_vhext.o
++
  
- -include $(SUBDIR)$(ARCH)/Makefile
+ -include $(SRC_PATH)/$(SUBDIR)$(ARCH)/Makefile
  
  DIRS = x86 libmpcodecs
  

diff --cc libavfilter/allfilters.c
index 7a0186e,99f7bc4..7574e56
--- 1/libavfilter/allfilters.c
--- 2/libavfilter/allfilters.c
+++ b/libavfilter/allfilters.c
@@@ -78,8 -85,9 +85,11 @@@ void avfilter_register_all(void
      REGISTER_FILTER (FREI0R,      frei0r_src,  vsrc);
      REGISTER_FILTER (MOVIE,       movie,       vsrc);
      REGISTER_FILTER (NULLSRC,     nullsrc,     vsrc);
+     REGISTER_FILTER (RGBTESTSRC,  rgbtestsrc,  vsrc);
+     REGISTER_FILTER (TESTSRC,     testsrc,     vsrc);
  
+     REGISTER_FILTER (BUFFER,      buffersink,  vsink);
      REGISTER_FILTER (NULLSINK,    nullsink,    vsink);
 +
 +    REGISTER_FILTER (VHEXT,       vhext,       vf);
  }