aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-09-28 03:47:39 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-09-28 03:47:39 +0200
commit5a6e7771edc59a8971793a5d0d6426c4ce5ee4fa (patch)
tree386c32fda960d60799d37207ded5a184d2882968 /libavcodec
parent530cd7a913b31dd563922d42ba575e8a3da02be1 (diff)
downloadffmpeg-5a6e7771edc59a8971793a5d0d6426c4ce5ee4fa.tar.gz
h264: dont set key_frame when the frame is not a real keyframe.
Fixes Ticket514 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/h264.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 3424f02406..5e9d58c95e 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1441,7 +1441,7 @@ static void decode_postinit(H264Context *h, int setup_finished){
}
if (h->next_output_pic && h->next_output_pic->sync) {
- h->sync |= 2*!!h->next_output_pic->f.key_frame;
+ h->sync |= 2;
}
if (setup_finished)
@@ -3731,7 +3731,7 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){
(hx->nal_unit_type == NAL_IDR_SLICE);
if (h->recovery_frame == h->frame_num) {
- s->current_picture_ptr->f.key_frame |= 1;
+ h->sync |= 1;
h->recovery_frame = -1;
}