Commit a28313b0 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '351d0f8b'

* commit '351d0f8b':
  get_bits: remove unused assignment

Conflicts:
	libavcodec/get_bits.h

See: ea6178ffMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 66b9e60a 351d0f8b
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