Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 May 2015 15:59:45 +0000 (17:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 May 2015 15:59:56 +0000 (17:59 +0200)
* cehoyos/master:
  lavfi/cropdetect: Fix cropdetect for > 8 bit input.
  lavf/apngenc: Fix png remuxing by using default extension apng.
  lavf/mxfenc: Write correct interlaced flag when muxing dnxhd.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge