diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-09 23:52:54 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-10-24 11:40:01 +0200 |
| commit | 87f719a03f23dd16c55bf7c60d3ef848936885c0 (patch) | |
| tree | a52c96145708bdf1999a6c8ae9e905df78ccdb5a /libavcodec/h264_refs.c | |
| parent | 5df35d9a21d55e69126757ad32df88764d4f27f0 (diff) | |
| download | ffmpeg-87f719a03f23dd16c55bf7c60d3ef848936885c0.tar.gz | |
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
(cherry picked from commit 6636dd551fda4fac77f2caa25d24d81abcadcd71)
Diffstat (limited to '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 a94ef1a536..f39e69a271 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -656,7 +656,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; |