[FFmpeg-cvslog] h264: use long reading for first_mb_in_slice

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct 27 17:53:08 2011 +0200| [23040e2e3dafbe99a37e70c854073a102b8a7f46] | committer: Michael Niedermayer

h264: use long reading for first_mb_in_slice

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/h264.c        |    2 +-
 libavcodec/h264_parser.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 46a4bb5..63eb277 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2632,7 +2632,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
         s->me.qpel_avg= s->dsp.avg_h264_qpel_pixels_tab;
     }
 
-    first_mb_in_slice= get_ue_golomb(&s->gb);
+    first_mb_in_slice= get_ue_golomb_long(&s->gb);
 
     if(first_mb_in_slice == 0){ //FIXME better field boundary detection
         if(h0->current_slice && FIELD_PICTURE){
diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c
index 614dad3..778ef1e 100644
--- a/libavcodec/h264_parser.c
+++ b/libavcodec/h264_parser.c
@@ -185,7 +185,7 @@ static inline int parse_nal_units(AVCodecParserContext *s,
             s->key_frame = 1;
             /* fall through */
         case NAL_SLICE:
-            get_ue_golomb(&h->s.gb);  // skip first_mb_in_slice
+            get_ue_golomb_long(&h->s.gb);  // skip first_mb_in_slice
             slice_type = get_ue_golomb_31(&h->s.gb);
             s->pict_type = golomb_to_pict_type[slice_type % 5];
             if (h->sei_recovery_frame_cnt >= 0) {