aboutsummaryrefslogtreecommitdiffstats
path: root/libavdevice
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2011-06-05 14:20:56 -0500
committerLuca Barbato <lu_zero@gentoo.org>2011-06-05 14:20:56 -0500
commit2c6fb9f03204d25bee68f1175233c1fff8e77e65 (patch)
tree0248be1d0a049f2641c0d6361a276039ed439bb3 /libavdevice
parentef5d7e18f4be8f36afc1034369849bff980ad9b1 (diff)
downloadffmpeg-2c6fb9f03204d25bee68f1175233c1fff8e77e65.tar.gz
v4l2: do not force NTSC as standard
Setting a standard is meaningful only for analog capture devices.
Diffstat (limited to 'libavdevice')
-rw-r--r--libavdevice/v4l2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index 839d290b63..2553bca48a 100644
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@ -730,7 +730,7 @@ static int v4l2_read_close(AVFormatContext *s1)
#define OFFSET(x) offsetof(struct video_data, x)
#define DEC AV_OPT_FLAG_DECODING_PARAM
static const AVOption options[] = {
- { "standard", "", offsetof(struct video_data, standard), FF_OPT_TYPE_STRING, {.str = "NTSC" }, 0, 0, AV_OPT_FLAG_DECODING_PARAM },
+ { "standard", "", offsetof(struct video_data, standard), FF_OPT_TYPE_STRING, {.str = NULL }, 0, 0, AV_OPT_FLAG_DECODING_PARAM },
{ "channel", "", offsetof(struct video_data, channel), FF_OPT_TYPE_INT, {.dbl = 0 }, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
{ "video_size", "A string describing frame size, such as 640x480 or hd720.", OFFSET(video_size), FF_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC },
{ "pixel_format", "", OFFSET(pixel_format), FF_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC },