[FFmpeg-cvslog] Merge commit 'ac4a5e3abd8a022ab32245ad527ffc37eabab8b1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov  6 18:16:38 2014 +0100| [ad0cf8e063b846cd3653875a1b88c7469fd257a1] | committer: Michael Niedermayer

Merge commit 'ac4a5e3abd8a022ab32245ad527ffc37eabab8b1'

* commit 'ac4a5e3abd8a022ab32245ad527ffc37eabab8b1':
  pthreads_frame: Do not leak on failure path

See: 11679e1b90f6e52a3643efb45d06ea5adf65098a
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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