Merge commit '5127c00b971b674f72609369b39a9c0f7c36977d'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 10:24:15 +0000 (11:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 10:24:49 +0000 (11:24 +0100)
commite4588e376a63e50a98c4ae0658cf45a9c4e6c556
tree0bb9f34a282407006a4ffe48407baac0321f6a8d
parent0e69c16e965d737dbd7a1433ef3ae66c09c88742
parent5127c00b971b674f72609369b39a9c0f7c36977d
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@gmx.at>