aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-10-09 23:52:54 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2013-10-24 11:22:24 +0200
commit6636dd551fda4fac77f2caa25d24d81abcadcd71 (patch)
tree158ecc110a7b796781c0d389d76b8b06a26c344e /libavcodec
parent8ffdcd04c481e3357c9df2cad9dbb94fc3d9e0e7 (diff)
downloadffmpeg-6636dd551fda4fac77f2caa25d24d81abcadcd71.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
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/h264_refs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c
index 32c84d8e6f..6061844cef 100644
--- a/libavcodec/h264_refs.c
+++ b/libavcodec/h264_refs.c
@@ -687,7 +687,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;