[libav-commits] v4l2: use V4L2_FMT_FLAG_EMULATED only if it is defined

Janne Grunau git at libav.org
Wed Jan 4 21:34:54 CET 2012


Module: libav
Branch: master
Commit: f13a9ca90602408d96fcbaf249a299ac1243609c

Author:    Janne Grunau <janne-libav at jannau.net>
Committer: Janne Grunau <janne-libav at jannau.net>
Date:      Wed Jan  4 20:29:57 2012 +0100

v4l2: use V4L2_FMT_FLAG_EMULATED only if it is defined

V4L2_FMT_FLAG_EMULATED was added in 2.6.32.

---

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

diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index 2895a01..71e5b11 100644
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@ -316,10 +316,12 @@ static void list_formats(AVFormatContext *ctx, int fd, int type)
             continue;
         }
 
+#ifdef V4L2_FMT_FLAG_EMULATED
         if (vfd.flags & V4L2_FMT_FLAG_EMULATED) {
             av_log(ctx, AV_LOG_WARNING, "%s", "Emulated");
             continue;
         }
+#endif
 #if HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE
         list_framesizes(ctx, fd, vfd.pixelformat);
 #endif



More information about the libav-commits mailing list