diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 21:21:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 21:26:12 +0200 |
| commit | 60dbed6067676d847157fe530b1caed06c77e2ab (patch) | |
| tree | 62d43c9dc8162c8c809cc689f599befb2fdc2bbe /libavcodec/libxvid.c | |
| parent | fb33bff990a8327f59d4c7c509bba1f62bbd6c5a (diff) | |
| parent | 4b1f5e5090abed6c618c8ba380cd7d28d140f867 (diff) | |
| download | ffmpeg-60dbed6067676d847157fe530b1caed06c77e2ab.tar.gz | |
Merge commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867'
* commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867':
cosmetics: Write NULL pointer inequality checks more compactly
Conflicts:
libavcodec/dvdsubdec.c
libavcodec/h263dec.c
libavcodec/libxvid.c
libavcodec/rv10.c
libavcodec/utils.c
libavformat/format.c
libavformat/matroskadec.c
libavformat/segment.c
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libxvid.c')
| -rw-r--r-- | libavcodec/libxvid.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c index a97d53c60a..d415cbf83c 100644 --- a/libavcodec/libxvid.c +++ b/libavcodec/libxvid.c @@ -139,7 +139,7 @@ static int xvid_ff_2pass_destroy(struct xvid_context *ref, xvid_plg_destroy_t *param) { /* Currently cannot think of anything to do on destruction */ /* Still, the framework should be here for reference/use */ - if( ref->twopassbuffer != NULL ) + if (ref->twopassbuffer) ref->twopassbuffer[0] = 0; return 0; } @@ -789,7 +789,7 @@ static av_cold int xvid_encode_close(AVCodecContext *avctx) { x->encoder_handle = NULL; av_freep(&avctx->extradata); - if( x->twopassbuffer != NULL ) { + if (x->twopassbuffer) { av_freep(&x->twopassbuffer); av_freep(&x->old_twopassbuffer); avctx->stats_out = NULL; |