Merge commit 'd1f539c97e04e7cebecaf6916c5064f243d39fcf'
authorClément Bœsch <clement@stupeflix.com>
Fri, 1 Jul 2016 12:17:56 +0000 (14:17 +0200)
committerClément Bœsch <clement@stupeflix.com>
Fri, 1 Jul 2016 12:19:09 +0000 (14:19 +0200)
commit2021326f995ff2eda5cd2aae600853f6eddb507d
tree262b8d03fc35f00a8a6e5d412cbb4f897fbff90b
parent99b37f53a13d6e2453c65b12fd0c0e025310021f
parentd1f539c97e04e7cebecaf6916c5064f243d39fcf
Merge commit 'd1f539c97e04e7cebecaf6916c5064f243d39fcf'

* commit 'd1f539c97e04e7cebecaf6916c5064f243d39fcf':
  h264: merge the two reinit blocks in slice_header_parse()

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