projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
3adba2d
)
h264: cap max has_b_frames at MAX_DELAYED_PIC_COUNT - 1.
author
Ronald S. Bultje
<rsbultje@gmail.com>
Thu, 1 Dec 2011 20:45:10 +0000
(12:45 -0800)
committer
Ronald S. Bultje
<rsbultje@gmail.com>
Thu, 1 Dec 2011 20:46:28 +0000
(12:46 -0800)
This prevents frame allocation overflows, and fixed
fate-h264-conformance-mr3_tandberg_b with 2 threads.
libavcodec/h264.c
patch
|
blob
|
history
diff --git
a/libavcodec/h264.c
b/libavcodec/h264.c
index
ad1ab69
..
96062b7
100644
(file)
--- a/
libavcodec/h264.c
+++ b/
libavcodec/h264.c
@@
-1438,7
+1438,7
@@
static void decode_postinit(H264Context *h, int setup_finished){
if( s->avctx->strict_std_compliance >= FF_COMPLIANCE_STRICT
&& !h->sps.bitstream_restriction_flag){
- s->avctx->has_b_frames
= MAX_DELAYED_PIC_COUNT
;
+ s->avctx->has_b_frames
= MAX_DELAYED_PIC_COUNT - 1
;
s->low_delay= 0;
}