[FFmpeg-cvslog] Merge commit '336d2f0979b43a39bd11a047d798b7990d8b07c6'

Michael Niedermayer git at videolan.org
Mon Apr 20 12:45:50 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at 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 <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eb8756e4b7f9e53044fbe033531c53414669a4e0
---





More information about the ffmpeg-cvslog mailing list