virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

v4l2: use av_assert

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-07-08 17:05:35 +02:00
parent 3f345290dc
commit a6a085a928
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavdevice/v4l2.c
View File

@ -46,6 +46,7 @@
#endif #endif
#include <linux/videodev2.h> #include <linux/videodev2.h>
#endif #endif
#include "libavutil/avassert.h"
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "libavutil/log.h" #include "libavutil/log.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
@ -560,7 +561,7 @@ static int mmap_read_frame(AVFormatContext *ctx, AVPacket *pkt)
return AVERROR(errno); return AVERROR(errno);
} }
assert(buf.index < s->buffers); av_assert0(buf.index < s->buffers);
if (s->frame_size > 0 && buf.bytesused != s->frame_size) { if (s->frame_size > 0 && buf.bytesused != s->frame_size) {
av_log(ctx, AV_LOG_ERROR, av_log(ctx, AV_LOG_ERROR,
"The v4l2 frame is %d bytes, but %d bytes are expected\n", "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) { if (desired_format != 0) {
*codec_id = fmt_v4l2codec(desired_format); *codec_id = fmt_v4l2codec(desired_format);
assert(*codec_id != CODEC_ID_NONE); av_assert0(*codec_id != CODEC_ID_NONE);
} }
return desired_format; return desired_format;