RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'f43789b76e661acd93c21664678f140e53cfa1fa' 

* commit 'f43789b76e661acd93c21664678f140e53cfa1fa':
  hevc: set the keyframe flag on output frames

See: e2760de605
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-11 12:05:47 +02:00
parent 673a2b3818 f43789b76e
commit aa56c37c8a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/hevc.c
View File

@ -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;
}