Merge commit 'd9442d13033a24b14ebae149dcdb42709430e2d9'
authorClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 14:49:47 +0000 (15:49 +0100)
committerClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 14:49:47 +0000 (15:49 +0100)
commit3eed90b1ed6cd0d8fb2b3fbf665dd2504aaf5384
tree6b5156867b6a90d38f027fb01629c25958283096
parent4ded6f9b312731a7cbac7da2c097eeeab8c1954e
parentd9442d13033a24b14ebae149dcdb42709430e2d9
Merge commit 'd9442d13033a24b14ebae149dcdb42709430e2d9'

* commit 'd9442d13033a24b14ebae149dcdb42709430e2d9':
  rm: Drop broken disabled cruft

Merged-by: Clément Bœsch <u@pkh.me>
libavformat/rmdec.c
libavformat/rmenc.c