[SCM] libav/experimental: Add the -em_rate option to make the img reader run at the nominal frame rate. This is used for regression testing ffserver

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit e47ec5157ea3695834084901a8111f71ba1db69c
Author: Philip Gladstone <philipjsg at users.sourceforge.net>
Date:   Wed Dec 11 03:21:40 2002 +0000

    Add the -em_rate option to make the img reader run at the nominal frame rate.
    This is used for regression testing ffserver
    
    Originally committed as revision 1333 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffmpeg.c b/ffmpeg.c
index e52e378..af0d40f 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -83,6 +83,7 @@ static int frame_bottomBand = 0;
 static int frame_leftBand  = 0;
 static int frame_rightBand = 0;
 static int frame_rate = 25 * FRAME_RATE_BASE;
+extern int emulate_frame_rate;
 static int video_bit_rate = 200*1000;
 static int video_bit_rate_tolerance = 4000*1000;
 static int video_qscale = 0;
@@ -2560,6 +2561,7 @@ const OptionDef options[] = {
     /* video options */
     { "b", HAS_ARG, {(void*)opt_video_bitrate}, "set video bitrate (in kbit/s)", "bitrate" },
     { "r", HAS_ARG, {(void*)opt_frame_rate}, "set frame rate (in Hz)", "rate" },
+    { "em_rate", OPT_BOOL|OPT_EXPERT, {(void*)&emulate_frame_rate}, "makes img reading happen at nominal frame rate" },
     { "s", HAS_ARG, {(void*)opt_frame_size}, "set frame size (WxH or abbreviation)", "size" },
     { "croptop", HAS_ARG, {(void*)opt_frame_crop_top}, "set top crop band size (in pixels)", "size" },
     { "cropbottom", HAS_ARG, {(void*)opt_frame_crop_bottom}, "set bottom crop band size (in pixels)", "size" },

-- 
Libav/FFmpeg packaging