[FFmpeg-cvslog] Merge commit '86e1a35802df42f51337d3fed8d5d99d0898c8bf'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 20 22:49:50 2015 +0200| [037c9c25e6213852e33de5b6e00bbf9d26195938] | committer: Michael Niedermayer

Merge commit '86e1a35802df42f51337d3fed8d5d99d0898c8bf'

* commit '86e1a35802df42f51337d3fed8d5d99d0898c8bf':
  h264_ps: Return meaningful error codes and address a memory leak

Conflicts:
	libavcodec/h264_ps.c

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

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