Merge commit '351d0f8b7a6ecce411ae75fb3511573c34317218'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Nov 2014 20:01:39 +0000 (21:01 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Nov 2014 20:03:06 +0000 (21:03 +0100)
commita28313b09e73d8e908223027909e9b836a3c0fa5
tree0901d636b7084f1bdf43493e5c65c28227837883
parent66b9e60af0b82ee8bd63d84011127dca4ea1e23f
parent351d0f8b7a6ecce411ae75fb3511573c34317218
Merge commit '351d0f8b7a6ecce411ae75fb3511573c34317218'

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

Conflicts:
libavcodec/get_bits.h

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