Merge commit '733f4b05f0e120ddd0393b23f2b6d9106cf922e4'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 20:16:22 +0000 (21:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 20:16:34 +0000 (21:16 +0100)
commit79216a189b4e55dd3dbeb49612111061f2c2b717
tree1c141f45a4e35bb2ff40603ce9e25fcbbd8cb547
parent32b2b7bd8c5aed23e03c2bc75ccb1d46753f8798
parent733f4b05f0e120ddd0393b23f2b6d9106cf922e4
Merge commit '733f4b05f0e120ddd0393b23f2b6d9106cf922e4'

* commit '733f4b05f0e120ddd0393b23f2b6d9106cf922e4':
  avplay: Check format allocation inside decode_thread()

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