[FFmpeg-cvslog] avcodec/dca: simplify condition

[foo86]

ffmpeg | branch: master | foo86 <foobaz86 at gmail.com> | Wed Mar  2 22:32:10 2016 +0300| [00e3717b4a21d93bdf822588a9f6fbfd1fca27a5] | committer: Michael Niedermayer

avcodec/dca: simplify condition

Reviewed-by: Hendrik Leppkes <h.leppkes at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=00e3717b4a21d93bdf822588a9f6fbfd1fca27a5
---

 libavcodec/dca_xll.c |   17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/libavcodec/dca_xll.c b/libavcodec/dca_xll.c
index ffe8ef3..5e6cf35 100644
--- a/libavcodec/dca_xll.c
+++ b/libavcodec/dca_xll.c
@@ -460,19 +460,14 @@ static int chs_parse_band_data(DCAXllDecoder *s, DCAXllChSet *c, int band, int s
             // Unpack Rice coding flag
             // 0 - linear code, 1 - Rice code
             c->rice_code_flag[i] = get_bits1(&s->gb);
-            if (!c->seg_common && c->rice_code_flag[i]) {
-                // Unpack Hybrid Rice coding flag
-                // 0 - Rice code, 1 - Hybrid Rice code
-                if (get_bits1(&s->gb))
-                    // Unpack binary code length for isolated samples
-                    c->bitalloc_hybrid_linear[i] = get_bits(&s->gb, c->nabits) + 1;
-                else
-                    // 0 indicates no Hybrid Rice coding
-                    c->bitalloc_hybrid_linear[i] = 0;
-            } else {
+            // Unpack Hybrid Rice coding flag
+            // 0 - Rice code, 1 - Hybrid Rice code
+            if (!c->seg_common && c->rice_code_flag[i] && get_bits1(&s->gb))
+                // Unpack binary code length for isolated samples
+                c->bitalloc_hybrid_linear[i] = get_bits(&s->gb, c->nabits) + 1;
+            else
                 // 0 indicates no Hybrid Rice coding
                 c->bitalloc_hybrid_linear[i] = 0;
-            }
         }
 
         // Unpack coding parameters