summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-10-27 17:53:08 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-10-27 17:53:08 +0200
commit23040e2e3dafbe99a37e70c854073a102b8a7f46 (patch)
treec4492cf2f13743504d6bc50d6e2b7823fde00bb2
parent3e7db0a9ee758bf0570a141be1fea64f8d9c03db (diff)
h264: use long reading for first_mb_in_slice
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/h264.c2
-rw-r--r--libavcodec/h264_parser.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 46a4bb5dbd..63eb277ea6 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 614dad35eb..778ef1efec 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) {