From: Michael Niedermayer <michaelni@gmx.at>
Date: Sat, 6 Sep 2014 10:40:34 +0000 (+0200)
Subject: avcodec/hevc_ps: Always initialize backup in decode_vui()
X-Git-Tag: android-x86-6.0-r1~3203
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cbb277988afc7032e632393e2c96a70d4389ac4f;p=android-x86%2Fexternal-ffmpeg.git

avcodec/hevc_ps: Always initialize backup in decode_vui()

Fixes CID1237283

Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---

diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c
index 365652c225..c17ca04350 100644
--- a/libavcodec/hevc_ps.c
+++ b/libavcodec/hevc_ps.c
@@ -527,8 +527,7 @@ static void decode_vui(HEVCContext *s, HEVCSPS *sps)
 
     vui->default_display_window_flag = get_bits1(gb);
     // Backup context in case an alternate header is detected
-    if( get_bits_left(gb) >= 66)
-        memcpy(&backup, gb, sizeof(backup));
+    memcpy(&backup, gb, sizeof(backup));
 
     if (vui->default_display_window_flag) {
         //TODO: * 2 is only valid for 420