Merge commit 'a529f6648ed450f7e846a0e704a0a3260aaa4b62' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Mar 2015 01:16:54 +0000 (03:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Mar 2015 01:16:54 +0000 (03:16 +0200)
* commit 'a529f6648ed450f7e846a0e704a0a3260aaa4b62':
  hevc: zero the correct variables on invalid crop parameters

Conflicts:
libavcodec/hevc_ps.c

See: 7bce99216f744f76bf9e8cb449cd11a5e301ef68
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge