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)
commit783e94cb119052722d38df0efa248fecc53508ab
tree325b7d3025c336b91869e87c12238267b92fab04
parentf320f2f4c6398404a8653b4a78134ab42dda9ea7
parent0bca6182b26a2094c5229fef4d8fe8ecb9a75e58
Merge remote-tracking branch 'cehoyos/master'

* 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>