Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 18 Jul 2013 16:10:41 +0000 (18:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 18 Jul 2013 16:10:45 +0000 (18:10 +0200)
commited8c34a7666a2ad7a528492c3aeed00decb0c35e
tree2f3699a8cb36ad73cbb51797c153a202e91a3f38
parent7203dbde3910b9be3345bc04667a01ecd9291445
parentb39a6bbe7f43710d8e7163757c5aeef596878712
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix pix_fmt detection in the native jpeg2000 decoder.
  lavf/concat: Never fail for sample aspect ratio 0:1.
  lut3d: Fix reading 3dl files with leading comments.

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