Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Jun 2013 08:14:12 +0000 (10:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Jun 2013 08:14:16 +0000 (10:14 +0200)
commit16310e36d9405b8d7d0da1273b03bec3adfec153
treec7dde9eefbdf26af21e462868c91ec0e97644017
parent831e749bc926db2aea5f999529e176d18c832c82
parent41f3c60fbb7420f41295c8e0cf80acf9e71f72d0
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Avoid a null pointer dereference in avcodec_decode_video2().
  Set block_align when reading QDM2 in mov.
  Fix muxing QDM2 mono into caf.

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