Merge commit 'f43789b76e661acd93c21664678f140e53cfa1fa'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Jul 2014 10:05:47 +0000 (12:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Jul 2014 10:16:24 +0000 (12:16 +0200)
commitaa56c37c8ac53ddc4ee828406b2185bf20a1e5c7
treecc23574c25d7e8a0c25801a4d177c5d3a9c5b18f
parent673a2b3818032ccf98f7846e33f54f7b89a41401
parentf43789b76e661acd93c21664678f140e53cfa1fa
Merge commit 'f43789b76e661acd93c21664678f140e53cfa1fa'

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

See: e2760de60514b949c0a5584d797d933f711f5b14
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/hevc.c