From 06512bf6e5f170b61393e2323b11dc45a87a6ee7 Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tmatth@videolan.org>
Date: Tue, 19 Apr 2016 12:36:05 -0400
Subject: [PATCH] mpg123: simplify NULL checks

---
 modules/codec/mpg123.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/codec/mpg123.c b/modules/codec/mpg123.c
index 8daae722a9..9480bc6c76 100644
--- a/modules/codec/mpg123.c
+++ b/modules/codec/mpg123.c
@@ -88,11 +88,11 @@ static void Flush( decoder_t *p_dec )
 static block_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
 {
     int i_err;
-    block_t *p_block = pp_block ? *pp_block : NULL;
     decoder_sys_t *p_sys = p_dec->p_sys;
 
-    if( !pp_block || !p_block )
+    if( !pp_block || !*pp_block )
         return NULL;
+    block_t *p_block = *pp_block;
 
     if( p_block->i_buffer == 0 )
         return NULL;
-- 
2.11.4.GIT