Merge commit 'debca90863e4ee53447efd02483c500f89766384'
authorClément Bœsch <u@pkh.me>
Wed, 27 Jul 2016 16:07:30 +0000 (18:07 +0200)
committerClément Bœsch <u@pkh.me>
Wed, 27 Jul 2016 16:07:30 +0000 (18:07 +0200)
commit6c41eda18ec0ef48763e1672266f7563f05775a5
tree57a70af28ce9da192990ce87506e5d2d753ee40d
parent87d1f820591b87bec452f33f451dee4db142ee9a
parentdebca90863e4ee53447efd02483c500f89766384
Merge commit 'debca90863e4ee53447efd02483c500f89766384'

* commit 'debca90863e4ee53447efd02483c500f89766384':
  h264: store {curr,max}_pic_num in the per-slice context

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