Merge commit 'b668662939de3a02454cfc9ba3e6d10b87527a40'
authorClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 09:27:33 +0000 (11:27 +0200)
committerClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 09:35:10 +0000 (11:35 +0200)
commitae753dbd0de448b51f0e0b980c26b94747ec44f5
tree505db82041ba42ecb799dd74e3b891b278172bd0
parent543142990b6f7b8757753c13ea6dbc56275c5c7e
parentb668662939de3a02454cfc9ba3e6d10b87527a40
Merge commit 'b668662939de3a02454cfc9ba3e6d10b87527a40'

* commit 'b668662939de3a02454cfc9ba3e6d10b87527a40':
  get_bits: Move BITSTREAM_READER_LE definition before all relevant #includes

The merge commit also includes changes for libavcodec/interplayacm.c and
libavcodec/truemotion2rt.c

Merged-by: Clément Bœsch <clement@stupeflix.com>
33 files changed:
libavcodec/bink.c
libavcodec/binkaudio.c
libavcodec/dxtory.c
libavcodec/eatgq.c
libavcodec/eatgv.c
libavcodec/escape124.c
libavcodec/escape130.c
libavcodec/g723_1dec.c
libavcodec/indeo2.c
libavcodec/indeo4.c
libavcodec/interplayvideo.c
libavcodec/ivi.c
libavcodec/metasound.c
libavcodec/msgsmdec.c
libavcodec/nellymoserdec.c
libavcodec/qdm2.c
libavcodec/ra288.c
libavcodec/sipr.c
libavcodec/smacker.c
libavcodec/tak.c
libavcodec/tak.h
libavcodec/tak_parser.c
libavcodec/takdec.c
libavcodec/tiertexseqv.c
libavcodec/tscc2.c
libavcodec/tta.c
libavcodec/vble.c
libavcodec/vorbis.c
libavcodec/vorbisdec.c
libavcodec/wavpack.c
libavcodec/webp.c
libavcodec/xan.c
libavformat/takdec.c