[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar  4 14:12:26 2014 +0100| [efc4439c894be9f45ec472ad2471143f94abc399] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  put_bits: Remove unused includes

Conflicts:
	libavcodec/put_bits.h

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=efc4439c894be9f45ec472ad2471143f94abc399
---