[FFmpeg-cvslog] v4l2: set default standard to NULL

Stefano Sabatini git at videolan.org
Sat May 28 21:24:03 CEST 2011


ffmpeg | branch: master | Stefano Sabatini <stefano.sabatini-lala at poste.it> | Sat May 28 20:47:17 2011 +0200| [af344a69f3a8240b508183586617fba6af698bb2] | committer: Stefano Sabatini

v4l2: set default standard to NULL

Avoid a failure with the default value of "NTSC". Not all drivers
support a standard.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=af344a69f3a8240b508183586617fba6af698bb2
---

 libavdevice/v4l2.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index d06ec29..deffa92 100644
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@ -717,7 +717,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 },
     { NULL },



More information about the ffmpeg-cvslog mailing list