]> git.sesse.net Git - ffmpeg/commitdiff
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)
* commit '47756f51fe836959ffa5c6e2baeacbd71e150069':
  dnxhdenc: Drop pointless, commented-out debug output

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

Simple merge