Browse Source

h264: use long reading for first_mb_in_slice

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n0.9
Michael Niedermayer 13 years ago
parent
commit
23040e2e3d
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      libavcodec/h264.c
  2. +1
    -1
      libavcodec/h264_parser.c

+ 1
- 1
libavcodec/h264.c View File

@@ -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){


+ 1
- 1
libavcodec/h264_parser.c View File

@@ -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) {


Loading…
Cancel
Save