diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 23:21:14 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 23:26:12 +0400 |
| commit | 60dbed6067676d847157fe530b1caed06c77e2ab (patch) | |
| tree | 62d43c9dc8162c8c809cc689f599befb2fdc2bbe /libavcodec/rv34.c | |
| parent | fb33bff990a8327f59d4c7c509bba1f62bbd6c5a (diff) | |
| parent | 4b1f5e5090abed6c618c8ba380cd7d28d140f867 (diff) | |
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/rv34.c')
| -rw-r--r-- | libavcodec/rv34.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index d8c5510602..cbefc3a304 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -1606,7 +1606,7 @@ static int finish_frame(AVCodecContext *avctx, AVFrame *pict) ff_print_debug_info(s, s->current_picture_ptr, pict); ff_mpv_export_qp_table(s, pict, s->current_picture_ptr, FF_QSCALE_TYPE_MPEG1); got_picture = 1; - } else if (s->last_picture_ptr != NULL) { + } else if (s->last_picture_ptr) { if ((ret = av_frame_ref(pict, s->last_picture_ptr->f)) < 0) return ret; ff_print_debug_info(s, s->last_picture_ptr, pict); |