Merge commit 'b96f0ab3d29cdd9ea9ddabfb2052f72bf8615661'
authorClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 14:56:19 +0000 (15:56 +0100)
committerClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 14:56:19 +0000 (15:56 +0100)
commitb6e88bf323bb2b23f5f1e29547aa61fa2c1e2e2c
treef584195a92429e08d336a6597c22bfc98c0ea90a
parent842e7853c73d09f8e262d379b5bc1479098655d8
parentb96f0ab3d29cdd9ea9ddabfb2052f72bf8615661
Merge commit 'b96f0ab3d29cdd9ea9ddabfb2052f72bf8615661'

* commit 'b96f0ab3d29cdd9ea9ddabfb2052f72bf8615661':
  h264: Kill broken disabled cruft

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