[FFmpeg-cvslog] v4l2: fix compile on systems that lack V4L2_PIX_FMT_CPIA1

Michael Niedermayer git at videolan.org
Fri Aug 31 04:39:11 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug 31 04:35:06 2012 +0200| [e7b43377774a94b4d11d7bbff644b110cdb4678b] | committer: Michael Niedermayer

v4l2: fix compile on systems that lack V4L2_PIX_FMT_CPIA1

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

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

diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index 4b43688..bab891a 100644
--- 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)



More information about the ffmpeg-cvslog mailing list