diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 12:12:03 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 12:12:03 +0200 |
commit | eb8756e4b7f9e53044fbe033531c53414669a4e0 (patch) | |
tree | f5b95807a385a158939d472281c8e0f9f9d22838 /CREDITS | |
parent | 0796a2ab4ff58d454006403395a4be91c403f161 (diff) | |
parent | 336d2f0979b43a39bd11a047d798b7990d8b07c6 (diff) | |
download | ffmpeg-eb8756e4b7f9e53044fbe033531c53414669a4e0.tar.gz |
Merge commit '336d2f0979b43a39bd11a047d798b7990d8b07c6'
* commit '336d2f0979b43a39bd11a047d798b7990d8b07c6':
avplay: Free frame and graph when memory allocation fails
Conflicts:
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'CREDITS')
0 files changed, 0 insertions, 0 deletions