[FFmpeg-cvslog] v4l2: use av_assert
Michael Niedermayer
git at videolan.org
Sun Jul 8 18:00:33 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jul 8 17:05:35 2012 +0200| [a6a085a9281314781c878e96da42139f8fe56848] | committer: Michael Niedermayer
v4l2: use av_assert
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a6a085a9281314781c878e96da42139f8fe56848
---
libavdevice/v4l2.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index 0369d71..4829b1b 100644
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@ -46,6 +46,7 @@
#endif
#include <linux/videodev2.h>
#endif
+#include "libavutil/avassert.h"
#include "libavutil/imgutils.h"
#include "libavutil/log.h"
#include "libavutil/opt.h"
@@ -560,7 +561,7 @@ static int mmap_read_frame(AVFormatContext *ctx, AVPacket *pkt)
return AVERROR(errno);
}
- assert(buf.index < s->buffers);
+ av_assert0(buf.index < s->buffers);
if (s->frame_size > 0 && buf.bytesused != s->frame_size) {
av_log(ctx, AV_LOG_ERROR,
"The v4l2 frame is %d bytes, but %d bytes are expected\n",
@@ -767,7 +768,7 @@ static uint32_t device_try_init(AVFormatContext *s1,
if (desired_format != 0) {
*codec_id = fmt_v4l2codec(desired_format);
- assert(*codec_id != CODEC_ID_NONE);
+ av_assert0(*codec_id != CODEC_ID_NONE);
}
return desired_format;
More information about the ffmpeg-cvslog
mailing list