projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6eac554
)
v4l2: fix compile on systems that lack V4L2_PIX_FMT_CPIA1
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 31 Aug 2012 02:35:06 +0000
(
04:35
+0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 31 Aug 2012 02:35:06 +0000
(
04:35
+0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavdevice/v4l2.c
patch
|
blob
|
history
diff --git
a/libavdevice/v4l2.c
b/libavdevice/v4l2.c
index
4b43688
..
bab891a
100644
(file)
--- a/
libavdevice/v4l2.c
+++ b/
libavdevice/v4l2.c
@@
-150,7
+150,9
@@
static struct fmt_map fmt_conversion_table[] = {
{ PIX_FMT_NV12, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_NV12 },
{ PIX_FMT_NONE, AV_CODEC_ID_MJPEG, V4L2_PIX_FMT_MJPEG },
{ PIX_FMT_NONE, AV_CODEC_ID_MJPEG, V4L2_PIX_FMT_JPEG },
+#ifdef V4L2_PIX_FMT_CPIA1
{ PIX_FMT_NONE, AV_CODEC_ID_CPIA, V4L2_PIX_FMT_CPIA1 },
+#endif
};
static int device_open(AVFormatContext *ctx)