aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2003-06-25 10:21:45 +0000
committerAlex Beregszaszi <alex@rtfs.hu>2003-06-25 10:21:45 +0000
commite3ee328330e924e6524003a6e082934fddb87a44 (patch)
tree1737169dd2e55b799c854862ce012cf6433bfd48 /ffmpeg.c
parent93caefc7d6608f109ae9ab16c2f6d5ae6c75cffd (diff)
downloadffmpeg-e3ee328330e924e6524003a6e082934fddb87a44.tar.gz
tv standard selection support for dv1394 and grab (v4l)
Originally committed as revision 1987 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index f39c24e2ac..3812f32109 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -159,6 +159,7 @@ static int rate_emu = 0;
static char *video_grab_format = "video4linux";
static char *video_device = NULL;
static int video_channel = 0;
+static char *video_standard = "ntsc";
static char *audio_grab_format = "audio_device";
static char *audio_device = NULL;
@@ -1858,6 +1859,11 @@ static void opt_video_channel(const char *arg)
video_channel = strtol(arg, NULL, 0);
}
+static void opt_video_standard(const char *arg)
+{
+ video_standard = av_strdup(arg);
+}
+
static void opt_audio_device(const char *arg)
{
audio_device = av_strdup(arg);
@@ -2457,6 +2463,7 @@ static void prepare_grab(void)
fmt1 = av_find_input_format(video_grab_format);
vp->device = video_device;
vp->channel = video_channel;
+ vp->standard = video_standard;
if (av_open_input_file(&ic, "", fmt1, 0, vp) < 0) {
fprintf(stderr, "Could not find video grab device\n");
exit(1);
@@ -2644,6 +2651,7 @@ const OptionDef options[] = {
{ "bufsize", HAS_ARG, {(void*)opt_video_buffer_size}, "set ratecontrol buffere size (in kbit)", "size" },
{ "vd", HAS_ARG | OPT_EXPERT, {(void*)opt_video_device}, "set video grab device", "device" },
{ "vc", HAS_ARG | OPT_EXPERT, {(void*)opt_video_channel}, "set video grab channel (DV1394 only)", "channel" },
+ { "tvstd", HAS_ARG | OPT_EXPERT, {(void*)opt_video_standard}, "set television standard (NTSC, PAL (SECAM))", "standard" },
{ "dv1394", OPT_EXPERT, {(void*)opt_dv1394}, "set DV1394 grab", "" },
{ "vcodec", HAS_ARG | OPT_EXPERT, {(void*)opt_video_codec}, "force video codec ('copy' to copy stream)", "codec" },
{ "me", HAS_ARG | OPT_EXPERT, {(void*)opt_motion_estimation}, "set motion estimation method",