diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-06-07 13:36:06 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-06-07 13:37:55 +0200 |
| commit | 3251af90379e69faf7b13e2d0236056c37bb0922 (patch) | |
| tree | da6ec1bc6ecbf7d81a26ebeb1e763c4650aa742c /libavdevice/v4l2.c | |
| parent | 7a8228c05e23d85b11a3853bf25a7ddbc662e2e3 (diff) | |
| download | ffmpeg-3251af90379e69faf7b13e2d0236056c37bb0922.tar.gz | |
v4l2: set default standard to NULL
It was errouneously changed to "NTSC" by the recent merge commit.
Diffstat (limited to 'libavdevice/v4l2.c')
| -rw-r--r-- | libavdevice/v4l2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 117f7cc534..7223654891 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -710,7 +710,7 @@ static int v4l2_read_close(AVFormatContext *s1) #define DEC AV_OPT_FLAG_DECODING_PARAM static const AVOption options[] = { - { "standard", "", OFFSET(standard), FF_OPT_TYPE_STRING, {.str = "NTSC" }, 0, 0, AV_OPT_FLAG_DECODING_PARAM }, + { "standard", "", OFFSET(standard), FF_OPT_TYPE_STRING, {.str = NULL }, 0, 0, AV_OPT_FLAG_DECODING_PARAM }, { "channel", "", OFFSET(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 }, |