[FFmpeg-cvslog] avdevice/v4l2: Try to fix build on netbsd/openbsd

Michael Niedermayer git at videolan.org
Sat May 9 00:35:20 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat May  9 00:27:00 2015 +0200| [d1d8ee5e9191dd3ba63532ea219cb916b4d64121] | committer: Michael Niedermayer

avdevice/v4l2: Try to fix build on netbsd/openbsd

Found-by: James Almer <jamrial at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavdevice/v4l2.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index 76f7c4e..1c2ce59 100644
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@ -521,12 +521,15 @@ static int mmap_read_frame(AVFormatContext *ctx, AVPacket *pkt)
     // always keep at least one buffer queued
     av_assert0(avpriv_atomic_int_get(&s->buffers_queued) >= 1);
 
+#ifdef V4L2_BUF_FLAG_ERROR
     if (buf.flags & V4L2_BUF_FLAG_ERROR) {
         av_log(ctx, AV_LOG_WARNING,
                "Dequeued v4l2 buffer contains corrupted data (%d bytes).\n",
                buf.bytesused);
         buf.bytesused = 0;
-    } else {
+    } else
+#endif
+    {
         /* CPIA is a compressed format and we don't know the exact number of bytes
          * used by a frame, so set it here as the driver announces it. */
         if (ctx->video_codec_id == AV_CODEC_ID_CPIA)



More information about the ffmpeg-cvslog mailing list