summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-11-11 12:50:03 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-11-11 12:50:03 +0100
commit039f4ff4c2f802bd5dc41096d9e84ba4b7e90d41 (patch)
tree02ea71e4438a0e953f1e64ef3d37aab084d7030b
parentdef8588fb588f75df336567918dc512ba04aae67 (diff)
h264: 2nd try at getting sm2v working
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/h264_ps.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c
index 5ba07448a6..28d3cbc2c3 100644
--- 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;