[FFmpeg-cvslog] Merge commit '5127c00b971b674f72609369b39a9c0f7c36977d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 21 11:24:15 2015 +0100| [e4588e376a63e50a98c4ae0658cf45a9c4e6c556] | committer: Michael Niedermayer

Merge commit '5127c00b971b674f72609369b39a9c0f7c36977d'

* commit '5127c00b971b674f72609369b39a9c0f7c36977d':
  hevc: zero the correct variables on invalid crop parameters

Conflicts:
	libavcodec/hevc_ps.c

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

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