Michael Niedermayer efc4439c89 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  put_bits: Remove unused includes

Conflicts:
	libavcodec/put_bits.h

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

2014-03-04 15:09:58 +01:00

5.8 KiB

Raw Blame History

View Raw