aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2008-04-01 12:22:33 +0000
committerRobert Swain <robert.swain@gmail.com>2008-04-01 12:22:33 +0000
commite11bc2c6631508f79bf333d10ba2d81df5ff7524 (patch)
treec2bbef2d85d0a34d57a0895522dd826d48c3b736
parent4d34bb19c16aa271ce65a4726325cb809a29d51e (diff)
downloadffmpeg-e11bc2c6631508f79bf333d10ba2d81df5ff7524.tar.gz
Send context to ffplay.c:opt_seek
Patch by Stefano Sabatini (stefano sabatini-lala poste it) Originally committed as revision 12663 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--ffplay.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/ffplay.c b/ffplay.c
index 7c2437d03d..2e194afb3b 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -2404,9 +2404,10 @@ static void opt_sync(const char *arg)
}
}
-static void opt_seek(const char *arg)
+static int opt_seek(const char *opt, const char *arg)
{
- start_time = parse_time_or_die("ss", arg, 1);
+ start_time = parse_time_or_die(opt, arg, 1);
+ return 0;
}
static int opt_debug(const char *opt, const char *arg)
@@ -2447,7 +2448,7 @@ const OptionDef options[] = {
{ "vn", OPT_BOOL, {(void*)&video_disable}, "disable video" },
{ "ast", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&wanted_audio_stream}, "", "" },
{ "vst", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&wanted_video_stream}, "", "" },
- { "ss", HAS_ARG, {(void*)&opt_seek}, "seek to a given position in seconds", "pos" },
+ { "ss", HAS_ARG | OPT_FUNC2, {(void*)&opt_seek}, "seek to a given position in seconds", "pos" },
{ "bytes", OPT_BOOL, {(void*)&seek_by_bytes}, "seek by bytes" },
{ "nodisp", OPT_BOOL, {(void*)&display_disable}, "disable graphical display" },
{ "f", HAS_ARG, {(void*)opt_format}, "force format", "fmt" },