Merge commit 'be3363f664d7314d55b42860bd4077154752d769'
authorClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 15:04:46 +0000 (16:04 +0100)
committerClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 15:04:46 +0000 (16:04 +0100)
commit56d63208d8249be3d2a54b8a25c27fc178d84df0
tree0b2f1e9a0485ac8968ade1bd19b9d87575f5a245
parent1a48a51bfcd0c8b1fd22ae6a8ad5b1e26bec5bee
parentbe3363f664d7314d55b42860bd4077154752d769
Merge commit 'be3363f664d7314d55b42860bd4077154752d769'

* commit 'be3363f664d7314d55b42860bd4077154752d769':
  nsv: Drop disabled cruft

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