Merge commit 'd450cb07d91ef39ad1d39bd7ca0cfce4bd7b13e7'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Mar 2015 02:51:49 +0000 (03:51 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Mar 2015 02:51:49 +0000 (03:51 +0100)
commita821617b5a09321a4ff875f77ad95daf6942c0d1
tree5bfa8eecc4497bb66a5255da219c56bbd615e5b0
parenta3f5a8c3e06f330f7c572e454dad5dae85515ac7
parentd450cb07d91ef39ad1d39bd7ca0cfce4bd7b13e7
Merge commit 'd450cb07d91ef39ad1d39bd7ca0cfce4bd7b13e7'

* commit 'd450cb07d91ef39ad1d39bd7ca0cfce4bd7b13e7':
  avplay: Check memory allocation

Conflicts:
ffplay.c

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