[FFmpeg-cvslog] lavd: add v4l and v4l2 aliases.

Clément Bœsch git at videolan.org
Sun Oct 30 02:42:44 CEST 2011


ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Sun Oct 30 02:39:30 2011 +0200| [6921272b237b1a26ab8cf4b5ef90fac3f2e32b78] | committer: Clément Bœsch

lavd: add v4l and v4l2 aliases.

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

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

diff --git a/libavdevice/v4l.c b/libavdevice/v4l.c
index 7c8b397..3e5e5eb 100644
--- a/libavdevice/v4l.c
+++ b/libavdevice/v4l.c
@@ -354,7 +354,7 @@ static const AVClass v4l_class = {
 };
 
 AVInputFormat ff_v4l_demuxer = {
-    .name           = "video4linux",
+    .name           = "video4linux,v4l",
     .long_name      = NULL_IF_CONFIG_SMALL("Video4Linux device grab"),
     .priv_data_size = sizeof(VideoData),
     .read_header    = grab_read_header,
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index 468d4c1..9e26b2d 100644
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@ -705,7 +705,7 @@ static const AVClass v4l2_class = {
 };
 
 AVInputFormat ff_v4l2_demuxer = {
-    .name           = "video4linux2",
+    .name           = "video4linux2,v4l2",
     .long_name      = NULL_IF_CONFIG_SMALL("Video4Linux2 device grab"),
     .priv_data_size = sizeof(struct video_data),
     .read_header    = v4l2_read_header,



More information about the ffmpeg-cvslog mailing list