Merge commit '47756f51fe836959ffa5c6e2baeacbd71e150069'
authorClément Bœsch <u@pkh.me>
Fri, 24 Mar 2017 12:18:24 +0000 (13:18 +0100)
committerClément Bœsch <u@pkh.me>
Fri, 24 Mar 2017 12:18:24 +0000 (13:18 +0100)
commite809c2e40d7a75d706dd1d74fd640b0bc0909863
treeb10eb5f1c9f998f5bd911ffebbff1940f2202b1a
parent2a69724fd5e0d380d201a955269622239288e6d5
parent47756f51fe836959ffa5c6e2baeacbd71e150069
Merge commit '47756f51fe836959ffa5c6e2baeacbd71e150069'

* commit '47756f51fe836959ffa5c6e2baeacbd71e150069':
  dnxhdenc: Drop pointless, commented-out debug output

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