[FFmpeg-cvslog] h264_cavlc: fix reading skip run

Michael Niedermayer git at videolan.org
Thu May 30 23:41:21 CEST 2013


ffmpeg | branch: release/0.11 | Michael Niedermayer <michaelni at gmx.at> | Thu May 30 18:30:42 2013 +0200| [5fd83f29f7f2d2770bd5d2786a549311b3fd4112] | committer: Carl Eugen Hoyos

h264_cavlc: fix reading skip run

Fixes Ticket2606

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 826b3a75cd295c03720e00d3de83e1abcbedd4b9)

Conflicts:
	libavcodec/h264_cavlc.c

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

 libavcodec/h264_cavlc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c
index 2d62baa..a0b3a43 100644
--- a/libavcodec/h264_cavlc.c
+++ b/libavcodec/h264_cavlc.c
@@ -709,7 +709,7 @@ int ff_h264_decode_mb_cavlc(H264Context *h){
                 down the code */
     if(h->slice_type_nos != AV_PICTURE_TYPE_I){
         if(s->mb_skip_run==-1)
-            s->mb_skip_run= get_ue_golomb(&s->gb);
+            s->mb_skip_run= get_ue_golomb_long(&s->gb);
 
         if (s->mb_skip_run--) {
             if(FRAME_MBAFF && (s->mb_y&1) == 0){



More information about the ffmpeg-cvslog mailing list