Merge commit '86e1a35802df42f51337d3fed8d5d99d0898c8bf'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 20:49:50 +0000 (22:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 20:49:50 +0000 (22:49 +0200)
commit037c9c25e6213852e33de5b6e00bbf9d26195938
treef8c70a3f54015dfe015a1d93670bc846c67c7ebe
parente6831c087e49157b64255388cc1bfdb60c76d79e
parent86e1a35802df42f51337d3fed8d5d99d0898c8bf
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@gmx.at>
libavcodec/h264_ps.c