Merge commit '336d2f0979b43a39bd11a047d798b7990d8b07c6'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 10:12:03 +0000 (12:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 10:12:03 +0000 (12:12 +0200)
commiteb8756e4b7f9e53044fbe033531c53414669a4e0
treef5b95807a385a158939d472281c8e0f9f9d22838
parent0796a2ab4ff58d454006403395a4be91c403f161
parent336d2f0979b43a39bd11a047d798b7990d8b07c6
Merge commit '336d2f0979b43a39bd11a047d798b7990d8b07c6'

* commit '336d2f0979b43a39bd11a047d798b7990d8b07c6':
  avplay: Free frame and graph when memory allocation fails

Conflicts:
ffplay.c

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