aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/rv10.c
diff options
context:
space:
mode:
authorGabriel Dume <gabriel.ddx84@gmail.com>2014-08-14 16:31:25 -0400
committerDiego Biurrun <diego@biurrun.de>2014-08-15 05:34:13 -0700
commit4b1f5e5090abed6c618c8ba380cd7d28d140f867 (patch)
treed5281695ec758c21ed6c0df8e3c03433bca28d18 /libavcodec/rv10.c
parentf929ab0569ff31ed5a59b0b0adb7ce09df3fca39 (diff)
downloadffmpeg-4b1f5e5090abed6c618c8ba380cd7d28d140f867.tar.gz
cosmetics: Write NULL pointer inequality checks more compactly
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diffstat (limited to 'libavcodec/rv10.c')
-rw-r--r--libavcodec/rv10.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c
index 2b571c9ba2..e5b76f08ca 100644
--- a/libavcodec/rv10.c
+++ b/libavcodec/rv10.c
@@ -737,7 +737,7 @@ static int rv10_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
i++;
}
- if (s->current_picture_ptr != NULL && s->mb_y >= s->mb_height) {
+ if (s->current_picture_ptr && s->mb_y >= s->mb_height) {
ff_er_frame_end(&s->er);
ff_mpv_frame_end(s);
@@ -745,7 +745,7 @@ static int rv10_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
if ((ret = av_frame_ref(pict, s->current_picture_ptr->f)) < 0)
return ret;
ff_print_debug_info(s, s->current_picture_ptr);
- } 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);