h264: 2nd try at getting sm2v working

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago · 039f4ff4c2
parent def8588fb5
commit 039f4ff4c2
1 changed files with 1 additions and 1 deletions
--- a/libavcodec/h264_ps.c
+++ b/libavcodec/h264_ps.c
@ -430,7 +430,7 @@ int ff_h264_decode_seq_parameter_set(H264Context *h){

    sps->ref_frame_count= get_ue_golomb_31(&s->gb);
    if (h->s.avctx->codec_tag == MKTAG('S', 'M', 'V', '2'))
-        sps->ref_frame_count= 2;
+        sps->ref_frame_count= FFMAX(2, sps->ref_frame_count);
    if(sps->ref_frame_count > MAX_PICTURE_COUNT-2 || sps->ref_frame_count > 16U){
        av_log(h->s.avctx, AV_LOG_ERROR, "too many reference frames\n");
        goto fail;