OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e8c04f6
)
v4l2: use V4L2_FMT_FLAG_EMULATED only if it is defined
author
Janne Grunau
<janne-libav@jannau.net>
Wed, 4 Jan 2012 19:29:57 +0000
(20:29 +0100)
committer
Janne Grunau
<janne-libav@jannau.net>
Wed, 4 Jan 2012 20:34:29 +0000
(21:34 +0100)
V4L2_FMT_FLAG_EMULATED was added in 2.6.32.
libavdevice/v4l2.c
patch
|
blob
|
history
diff --git
a/libavdevice/v4l2.c
b/libavdevice/v4l2.c
index
2895a01
..
71e5b11
100644
(file)
--- 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