Commit f351afb5 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '17e9d52c'

* commit '17e9d52c':
  hevc_ps: remove a write-only variable

Conflicts:
	libavcodec/hevc_ps.c

See: ba70563dMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 9195c26d 17e9d52c
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