git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
def8588
)
h264: 2nd try at getting sm2v working
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 11 Nov 2012 11:50:03 +0000
(12:50 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 11 Nov 2012 11:50:03 +0000
(12:50 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264_ps.c
patch
|
blob
|
history
diff --git
a/libavcodec/h264_ps.c
b/libavcodec/h264_ps.c
index
5ba0744
..
28d3cbc
100644
(file)
--- 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;