[FFmpeg-cvslog] hevc: Use get_bits_long() in decode_vui()

Michael Niedermayer git at videolan.org
Tue Mar 11 11:39:21 CET 2014


ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sat Feb 15 22:29:17 2014 +0100| [5aa4b29bbefc06fc2bbcb52af7a14393a1bcf504] | committer: Reinhard Tartler

hevc: Use get_bits_long() in decode_vui()

Fix assertion failure.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind

(cherry picked from commit 920c01adce6c273fc043513ff237a6266e612152)

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

 libavcodec/hevc_ps.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c
index c3aabe7..c4c7ee2 100644
--- a/libavcodec/hevc_ps.c
+++ b/libavcodec/hevc_ps.c
@@ -499,8 +499,8 @@ static void decode_vui(HEVCContext *s, HEVCSPS *sps)
 
     vui->vui_timing_info_present_flag = get_bits1(gb);
     if (vui->vui_timing_info_present_flag) {
-        vui->vui_num_units_in_tick               = get_bits(gb, 32);
-        vui->vui_time_scale                      = get_bits(gb, 32);
+        vui->vui_num_units_in_tick               = get_bits_long(gb, 32);
+        vui->vui_time_scale                      = get_bits_long(gb, 32);
         vui->vui_poc_proportional_to_timing_flag = get_bits1(gb);
         if (vui->vui_poc_proportional_to_timing_flag)
             vui->vui_num_ticks_poc_diff_one_minus1 = get_ue_golomb_long(gb);



More information about the ffmpeg-cvslog mailing list