Merge commit '07eea5a5ded1141632aefecfa59dcdc26de2d7ea'
authorClément Bœsch <u@pkh.me>
Fri, 24 Mar 2017 12:21:04 +0000 (13:21 +0100)
committerClément Bœsch <u@pkh.me>
Fri, 24 Mar 2017 12:21:04 +0000 (13:21 +0100)
commitbb9fdd9f616fa71f11fe40413a8a7bac178c057e
tree641fad951388cc8f99a3da17eec9cf5d61d4564d
parent50a06c841f05f8441f1a805f96059ba433108d85
parent07eea5a5ded1141632aefecfa59dcdc26de2d7ea
Merge commit '07eea5a5ded1141632aefecfa59dcdc26de2d7ea'

* commit '07eea5a5ded1141632aefecfa59dcdc26de2d7ea':
  nut: Drop pointless TRACE level debug code

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