Merge commit '17cb56b35672a2cd6ad7abe926e6cc772b8f4710'
authorClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 14:58:43 +0000 (15:58 +0100)
committerClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 14:58:43 +0000 (15:58 +0100)
commit2f42aef3e40c03699bab028c8951f8d2fbc85540
tree8495a186a6eee07cb725e1fbd219ba76aa8b1055
parentb6e88bf323bb2b23f5f1e29547aa61fa2c1e2e2c
parent17cb56b35672a2cd6ad7abe926e6cc772b8f4710
Merge commit '17cb56b35672a2cd6ad7abe926e6cc772b8f4710'

* commit '17cb56b35672a2cd6ad7abe926e6cc772b8f4710':
  ffv1: Remove broken disabled cruft

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