Merge commit 'f651c6a259d4bc78f25db11d25df9256d5110bd3'
authorClément Bœsch <u@pkh.me>
Fri, 29 Jul 2016 08:39:57 +0000 (10:39 +0200)
committerClément Bœsch <u@pkh.me>
Fri, 29 Jul 2016 08:39:57 +0000 (10:39 +0200)
commit7dda97fb86ff615e6a892052545d955816bb58f6
tree955d7d7efab57ac3a10f11fa11e0c5b0415e61c8
parentcc0852bee3608cd4b0cadb2ea4b7e58a22aa3c0e
parentf651c6a259d4bc78f25db11d25df9256d5110bd3
Merge commit 'f651c6a259d4bc78f25db11d25df9256d5110bd3'

* commit 'f651c6a259d4bc78f25db11d25df9256d5110bd3':
  h264: factor out setting frame properties / side data

Merged-by: Clément Bœsch <u@pkh.me>
libavcodec/h264.c
libavcodec/h264_slice.c