[FFmpeg-cvslog] v4l2: do not force NTSC as standard

Luca Barbato git at videolan.org
Mon Jun 6 03:51:50 CEST 2011


ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Sun Jun  5 14:20:56 2011 -0500| [2c6fb9f03204d25bee68f1175233c1fff8e77e65] | committer: Luca Barbato

v4l2: do not force NTSC as standard

Setting a standard is meaningful only for analog capture devices.

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

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

diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index 839d290..2553bca 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 },



More information about the ffmpeg-cvslog mailing list