[FFmpeg-cvslog] Use v4l2 input format automatically if filename starts with "/dev/video"

Andrey Utkin git at videolan.org
Wed Oct 29 02:55:42 CET 2014


ffmpeg | branch: master | Andrey Utkin <andrey.utkin at corp.bluecherry.net> | Wed Oct 29 01:59:25 2014 +0100| [b608fba67265eae1d46d043793073afae80f4b42] | committer: Carl Eugen Hoyos

Use v4l2 input format automatically if filename starts with "/dev/video"

Signed-off-by: Carl Eugen Hoyos <cehoyos at ag.or.at>

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

 libavdevice/v4l2.c |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index cf7a92c..59bb78b 100644
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@ -806,6 +806,13 @@ static int device_try_init(AVFormatContext *ctx,
     return ret;
 }
 
+static int v4l2_read_probe(AVProbeData *p)
+{
+    if (av_strstart(p->filename, "/dev/video", NULL))
+        return AVPROBE_SCORE_MAX - 1;
+    return 0;
+}
+
 static int v4l2_read_header(AVFormatContext *ctx)
 {
     struct video_data *s = ctx->priv_data;
@@ -1033,6 +1040,7 @@ AVInputFormat ff_v4l2_demuxer = {
     .name           = "video4linux2,v4l2",
     .long_name      = NULL_IF_CONFIG_SMALL("Video4Linux2 device grab"),
     .priv_data_size = sizeof(struct video_data),
+    .read_probe     = v4l2_read_probe,
     .read_header    = v4l2_read_header,
     .read_packet    = v4l2_read_packet,
     .read_close     = v4l2_read_close,



More information about the ffmpeg-cvslog mailing list