Merge commit '4cec43a9eeb58eb9e581a2d9d25f78e5bfbb0960'
authorClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 15:59:57 +0000 (17:59 +0200)
committerClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 15:59:57 +0000 (17:59 +0200)
commit4890b0851c5e6b607c9b8695166f13dc770b19bc
tree2d09bfae2f522e76c20cbaacf5db6b99bb2ecd25
parent9ab6f01839e3c0c025237ebf839ce8525c8d67d9
parent4cec43a9eeb58eb9e581a2d9d25f78e5bfbb0960
Merge commit '4cec43a9eeb58eb9e581a2d9d25f78e5bfbb0960'

* commit '4cec43a9eeb58eb9e581a2d9d25f78e5bfbb0960':
  h264: move calculating the POC out of h264_slice_header_parse()

Merged-by: Clément Bœsch <clement@stupeflix.com>
libavcodec/h264_slice.c