Browse Source

avcodec/h264dec: remove unnecessary checks in h264_decode_frame

These conditions are checked again in is_extra(). This patch makes no
functional changes.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n4.1
Zhao Zhili Michael Niedermayer 7 years ago
parent
commit
037b3bd14a
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      libavcodec/h264dec.c

+ 1
- 1
libavcodec/h264dec.c View File

@@ -986,7 +986,7 @@ static int h264_decode_frame(AVCodecContext *avctx, void *data,
&h->ps, &h->is_avc, &h->nal_length_size,
avctx->err_recognition, avctx);
}
if(h->is_avc && buf_size >= 9 && buf[0]==1 && buf[2]==0 && (buf[4]&0xFC)==0xFC && (buf[5]&0x1F) && buf[8]==0x67){
if (h->is_avc && buf_size >= 9 && buf[0]==1 && buf[2]==0 && (buf[4]&0xFC)==0xFC) {
if (is_extra(buf, buf_size))
return ff_h264_decode_extradata(buf, buf_size,
&h->ps, &h->is_avc, &h->nal_length_size,


Loading…
Cancel
Save