diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-10 01:52:54 +0400 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-10-24 13:52:05 +0400 |
| commit | 1b3803e8c11fd4b820ab3cd5614344b02afd0fe9 (patch) | |
| tree | c677533e48e65e7a43abd00d169e78397872fddd | |
| parent | dae552fbca8f3c132fb40d0234aa8edef86642d1 (diff) | |
avcodec/h264_refs: modify key frame detection heuristic to detect more cases
Fixes Ticket2968
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5ac6b6028f17b64723884c9fa72cfcbd369a1ba2)
Conflicts:
libavcodec/h264_refs.c
| -rw-r--r-- | libavcodec/h264_refs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index 926a6cc40d..b872759724 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -653,7 +653,7 @@ int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){ print_short_term(h); print_long_term(h); - if(err >= 0 && h->long_ref_count==0 && h->short_ref_count<=2 && h->pps.ref_count[0]<=1 + (s->picture_structure != PICT_FRAME) && s->current_picture_ptr->f.pict_type == AV_PICTURE_TYPE_I){ + if(err >= 0 && h->long_ref_count==0 && h->short_ref_count<=2 && h->pps.ref_count[0]<=2 + (s->picture_structure != PICT_FRAME) && s->current_picture_ptr->f.pict_type == AV_PICTURE_TYPE_I){ s->current_picture_ptr->sync |= 1; if(!h->s.avctx->has_b_frames) h->sync = 2; |