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 /libavcodec/libxvid.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 'libavcodec/libxvid.c')
| -rw-r--r-- | libavcodec/libxvid.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c index b521e010e3..a97d53c60a 100644 --- a/libavcodec/libxvid.c +++ b/libavcodec/libxvid.c @@ -110,7 +110,7 @@ static int xvid_ff_2pass_create(xvid_plg_create_t * param, char *log = x->context->twopassbuffer; /* Do a quick bounds check */ - if( log == NULL ) + if (!log) return XVID_ERR_FAIL; /* We use snprintf() */ @@ -201,7 +201,7 @@ static int xvid_ff_2pass_after(struct xvid_context *ref, char frame_type; /* Quick bounds check */ - if( log == NULL ) + if (!log) return XVID_ERR_FAIL; /* Convert the type given to us into a character */ @@ -285,7 +285,7 @@ static int xvid_strip_vol_header(AVCodecContext *avctx, if( vo_len > 0 ) { /* We need to store the header, so extract it */ - if( avctx->extradata == NULL ) { + if (!avctx->extradata) { avctx->extradata = av_malloc(vo_len); memcpy(avctx->extradata, pkt->data, vo_len); avctx->extradata_size = vo_len; @@ -483,7 +483,7 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) { rc2pass1.context = x; x->twopassbuffer = av_malloc(BUFFER_SIZE); x->old_twopassbuffer = av_malloc(BUFFER_SIZE); - if( x->twopassbuffer == NULL || x->old_twopassbuffer == NULL ) { + if (!x->twopassbuffer || !x->old_twopassbuffer) { av_log(avctx, AV_LOG_ERROR, "Xvid: Cannot allocate 2-pass log buffers\n"); goto fail; @@ -505,7 +505,7 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) { } x->twopassfd = fd; - if( avctx->stats_in == NULL ) { + if (!avctx->stats_in) { av_log(avctx, AV_LOG_ERROR, "Xvid: No 2-pass information loaded for second pass\n"); goto fail; |