Commit e4588e37 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '5127c00b'

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

Conflicts:
	libavcodec/hevc_ps.c

See: 57e58121Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 0e69c16e 5127c00b
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment