diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-11 12:05:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-11 12:16:24 +0200 |
| commit | aa56c37c8ac53ddc4ee828406b2185bf20a1e5c7 (patch) | |
| tree | cc23574c25d7e8a0c25801a4d177c5d3a9c5b18f | |
| parent | 673a2b3818032ccf98f7846e33f54f7b89a41401 (diff) | |
| parent | f43789b76e661acd93c21664678f140e53cfa1fa (diff) | |
| download | ffmpeg-aa56c37c8ac53ddc4ee828406b2185bf20a1e5c7.tar.gz | |
Merge commit 'f43789b76e661acd93c21664678f140e53cfa1fa'
* commit 'f43789b76e661acd93c21664678f140e53cfa1fa':
hevc: set the keyframe flag on output frames
See: e2760de60514b949c0a5584d797d933f711f5b14
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/hevc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index bd24c055b9..73899c94e2 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -2388,6 +2388,8 @@ static int hevc_frame_start(HEVCContext *s) goto fail; } + s->ref->frame->key_frame = IS_IRAP(s); + ret = set_side_data(s); if (ret < 0) goto fail; @@ -2879,7 +2881,6 @@ static int hevc_decode_frame(AVCodecContext *avctx, void *data, int *got_output, s->is_md5 = 0; if (s->is_decoded) { - s->ref->frame->key_frame = IS_IRAP(s); av_log(avctx, AV_LOG_DEBUG, "Decoded frame with POC %d.\n", s->poc); s->is_decoded = 0; } |