diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 20:33:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 21:00:50 +0200 |
| commit | fb33bff990a8327f59d4c7c509bba1f62bbd6c5a (patch) | |
| tree | c6f3ad232bed67c703999d78b3fcff66daa8c91d /libavdevice/v4l2.c | |
| parent | 3bb22973518cbef28504e4d5b9fd74453cc3339c (diff) | |
| parent | f929ab0569ff31ed5a59b0b0adb7ce09df3fca39 (diff) | |
| download | ffmpeg-fb33bff990a8327f59d4c7c509bba1f62bbd6c5a.tar.gz | |
Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'
* commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39':
cosmetics: Write NULL pointer equality checks more compactly
Conflicts:
cmdutils.c
ffmpeg_opt.c
ffplay.c
libavcodec/dvbsub.c
libavcodec/dvdsubdec.c
libavcodec/dvdsubenc.c
libavcodec/dxa.c
libavcodec/libxvid_rc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/rv10.c
libavcodec/tiffenc.c
libavcodec/utils.c
libavcodec/vc1dec.c
libavcodec/zmbv.c
libavdevice/v4l2.c
libavformat/matroskadec.c
libavformat/movenc.c
libavformat/sdp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/v4l2.c')
| -rw-r--r-- | libavdevice/v4l2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 64df0c7950..d9ff1a47e2 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -352,12 +352,12 @@ static int mmap_init(AVFormatContext *ctx) } s->buffers = req.count; s->buf_start = av_malloc_array(s->buffers, sizeof(void *)); - if (s->buf_start == NULL) { + if (!s->buf_start) { av_log(ctx, AV_LOG_ERROR, "Cannot allocate buffer pointers\n"); return AVERROR(ENOMEM); } s->buf_len = av_malloc_array(s->buffers, sizeof(unsigned int)); - if (s->buf_len == NULL) { + if (!s->buf_len) { av_log(ctx, AV_LOG_ERROR, "Cannot allocate buffer sizes\n"); av_free(s->buf_start); return AVERROR(ENOMEM); @@ -558,7 +558,7 @@ FF_ENABLE_DEPRECATION_WARNINGS #endif buf_descriptor = av_malloc(sizeof(struct buff_data)); - if (buf_descriptor == NULL) { + if (!buf_descriptor) { /* Something went wrong... Since av_malloc() failed, we cannot even * allocate a buffer for memcpying into it */ |