ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Fri Nov 21 
22:33:23 2014 +0100| [ac967ad8724ee860085cd108f822b3f830b89767] | committer: 
Michael Niedermayer

Merge commit 'd466d82faaf6e0e57a3a4be5e38e3902ef251ac3'

* commit 'd466d82faaf6e0e57a3a4be5e38e3902ef251ac3':
  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=ac967ad8724ee860085cd108f822b3f830b89767
---



_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to