Merge commit 'f966498e433fead2f5e6b5b66fad2ac062146d22'
authorClément Bœsch <u@pkh.me>
Wed, 27 Jul 2016 15:28:00 +0000 (17:28 +0200)
committerClément Bœsch <u@pkh.me>
Wed, 27 Jul 2016 15:31:18 +0000 (17:31 +0200)
commit87d1f820591b87bec452f33f451dee4db142ee9a
tree80a2aae11b6c7e7455218d8f402bd8ac5bf4b0f2
parentf8ce1e828299695997b832cb8d2d6b0d8f1f53ee
parentf966498e433fead2f5e6b5b66fad2ac062146d22
Merge commit 'f966498e433fead2f5e6b5b66fad2ac062146d22'

* commit 'f966498e433fead2f5e6b5b66fad2ac062146d22':
  h264: decode the poc values from the slice header into the per-slice context

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