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

Conflicts:
	libavcodec/h264_ps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>