Merge commit '5127c00b971b674f72609369b39a9c0f7c36977d'

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

Conflicts:
	libavcodec/hevc_ps.c

See: 57e5812198
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-03-21 11:24:15 +01:00
commit e4588e376a

Diff Content Not Available