Merge commit 'b25cd7540e7cba9868edc13817c0ce1ddef90ffc'
authorClément Bœsch <u@pkh.me>
Thu, 14 Jul 2016 17:41:37 +0000 (19:41 +0200)
committerClément Bœsch <u@pkh.me>
Thu, 14 Jul 2016 17:41:37 +0000 (19:41 +0200)
commit2c138b2c9b0ec92d9baf704498b1a32a989d03c5
tree47936ad7b7be37044b35288a9feaa9222566c52b
parentdef850676625417d27176a458787545330ab9427
parentb25cd7540e7cba9868edc13817c0ce1ddef90ffc
Merge commit 'b25cd7540e7cba9868edc13817c0ce1ddef90ffc'

* commit 'b25cd7540e7cba9868edc13817c0ce1ddef90ffc':
  h264: pass a H2645NAL to slice header decoding

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