ffmpeg | branch: release/2.4 | Michael Niedermayer <[email protected]> | Sun Jan
18 02:14:57 2015 +0100| [c2b658c0e7b7555c5dbf0b05d437fe35b5e9cd84] | committer:
Michael Niedermayer
Merge commit '5891fd017aa7bed4c423b8511090cf8641a0afa4' into release/2.4
* commit '5891fd017aa7bed4c423b8511090cf8641a0afa4':
dvdsubdec: Do not leak on failure path
Conflicts:
libavcodec/dvdsubdec.c
See: 7fa9f7ef1c2f0cee81ec6ea6a4ff10af4c4fc62c
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c2b658c0e7b7555c5dbf0b05d437fe35b5e9cd84
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
