Merge commit '5c31eaa9998b2185e0aa04d11adff128498dc14a'

* commit '5c31eaa9998b2185e0aa04d11adff128498dc14a':
  Remove unnecessary get_bits.h #includes and add missing headers where needed.

Merged-by: Clément Bœsch <clement@stupeflix.com>

diff --cc libavcodec/cabac.c
index a718d51ddbbf0861a4c7643867c05f143ab1b16d,5c590030f1f4cf8bd871496a275df69dbc117319..c0abe834cfa14199cc19dddcbe9cdae7b73b421c
--- 1/libavcodec/cabac.c
--- 2/libavcodec/cabac.c
+++ b/libavcodec/cabac.c
@@@ -27,8 -27,7 +27,8 @@@
  #include <string.h>
  
  #include "libavutil/common.h"
- #include "get_bits.h"
 +#include "libavutil/timer.h"
+ 
  #include "cabac.h"
  #include "cabac_functions.h"
  

diff --cc libavcodec/ffv1enc.c
index f2434e61aa52e4acd0d42087b0ab13fa0a9465f7,7995376ca0da5688c011ce6d5c3e5f3cef37f82b..948a23041940d6b2dc4d23a2ff913508f6645c0b
--- 1/libavcodec/ffv1enc.c
--- 2/libavcodec/ffv1enc.c
+++ b/libavcodec/ffv1enc.c
@@@ -30,8 -30,8 +30,9 @@@
  #include "libavutil/crc.h"
  #include "libavutil/opt.h"
  #include "libavutil/imgutils.h"
 +#include "libavutil/pixdesc.h"
 +#include "libavutil/timer.h"
+ 
  #include "avcodec.h"
  #include "internal.h"
  #include "put_bits.h"

diff --cc libavcodec/huffman.c
index d7403b88a3e7a6477e113a7620c6273864f43986,2a3db87df3720a740589bd8486ff82abd57ae104..1f5d8b9c05186c51f115215a46fba4960d9f98c9
--- 1/libavcodec/huffman.c
--- 2/libavcodec/huffman.c
+++ b/libavcodec/huffman.c
@@@ -26,9 -26,7 +26,8 @@@
  
  #include <stdint.h>
  
 +#include "libavutil/qsort.h"
  #include "avcodec.h"
- #include "get_bits.h"
  #include "huffman.h"
  
  /* symbol for Huffman tree node */

diff --cc libavcodec/iff.c
Simple merge

diff --cc libavcodec/yop.c
Simple merge

diff --cc libavformat/mpc.c
Simple merge

diff --cc libavformat/oggparseogm.c
index 65c2d5f2744aaf7216e792f718acaf09700c28ac,62784650b6aa7be7be91170632952472dd1abc23..f8e656dcb1a86d518df8505b1c51476a32a8bb04
--- 1/libavformat/oggparseogm.c
--- 2/libavformat/oggparseogm.c
+++ b/libavformat/oggparseogm.c
@@@ -23,10 -23,11 +23,12 @@@
  **/
  
  #include <stdlib.h>
+ 
 +#include "libavutil/avassert.h"
  #include "libavutil/intreadwrite.h"
- #include "libavcodec/get_bits.h"
+ 
  #include "libavcodec/bytestream.h"
+ 
  #include "avformat.h"
  #include "internal.h"
  #include "oggdec.h"

diff --cc libavformat/oggparsespeex.c
Simple merge

diff --cc libavformat/oggparsevorbis.c
Simple merge

diff --cc libavformat/tta.c
index ba1a3858347edb77a8391d35e3bc153cc92bb476,091b502567585478847c0077694a7cf19ff5fdb9..02656acffdc2d20a33d041de811a5446029284e1
--- 1/libavformat/tta.c
--- 2/libavformat/tta.c
+++ b/libavformat/tta.c
@@@ -19,14 -19,12 +19,15 @@@
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  
- #include "libavcodec/get_bits.h"
++#include "libavutil/crc.h"
+ #include "libavutil/dict.h"
+ #include "libavutil/intreadwrite.h"
+ 
 +#include "apetag.h"
  #include "avformat.h"
 +#include "avio_internal.h"
  #include "internal.h"
  #include "id3v1.h"
- #include "libavutil/crc.h"
- #include "libavutil/dict.h"
  
  typedef struct TTAContext {
      int totalframes, currentframe;