ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Apr 20
12:12:03 2015 +0200| [eb8756e4b7f9e53044fbe033531c53414669a4e0] | committer:
Michael Niedermayer
Merge commit '336d2f0979b43a39bd11a047d798b7990d8b07c6'
* commit '336d2f0979b43a39bd11a047d798b7990d8b07c6':
avplay: Free frame and graph when memory allocation fails
Conflicts:
ffplay.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eb8756e4b7f9e53044fbe033531c53414669a4e0
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
