Merge commit '266f241193b2fa8c99bb8b1f007c66bedd3b7d97'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 20:08:33 +0000 (21:08 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 20:09:11 +0000 (21:09 +0100)
commit32b2b7bd8c5aed23e03c2bc75ccb1d46753f8798
tree8ef359c9f72a7f0ff9bfcb4a5562335ceb3f4e11
parent15cd2a93e7f64b5b4e4367014a78ee8f9e63c2bb
parent266f241193b2fa8c99bb8b1f007c66bedd3b7d97
Merge commit '266f241193b2fa8c99bb8b1f007c66bedd3b7d97'

* commit '266f241193b2fa8c99bb8b1f007c66bedd3b7d97':
  avplay: Check frame allocation inside video_thread()

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