Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Mar 2014 13:12:26 +0000 (14:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Mar 2014 14:09:58 +0000 (15:09 +0100)
commitefc4439c894be9f45ec472ad2471143f94abc399
treeeb5aecf2581cbbf83f6d8cc8a4fa2054a83c0c82
parent8cc581fbf77ac25deb9eb9398cf4c759857aaeaa
parent973dc4e8d4ae0def273c33bac354ddc6d8e0c470
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>
libavcodec/ac3enc.h
libavcodec/dca.c
libavcodec/dcaenc.c
libavcodec/lzwenc.c
libavcodec/mjpeg.h
libavcodec/nellymoserenc.c
libavcodec/put_bits.h
libavcodec/ra144enc.c
libavcodec/s302menc.c
libavcodec/vorbisenc.c