Merge commit '5c31eaa9998b2185e0aa04d11adff128498dc14a'
authorClément Bœsch <clement@stupeflix.com>
Tue, 21 Jun 2016 13:42:49 +0000 (15:42 +0200)
committerClément Bœsch <clement@stupeflix.com>
Tue, 21 Jun 2016 13:42:49 +0000 (15:42 +0200)
* commit '5c31eaa9998b2185e0aa04d11adff128498dc14a':
  Remove unnecessary get_bits.h #includes and add missing headers where needed.

Merged-by: Clément Bœsch <clement@stupeflix.com>
1  2 
libavcodec/cabac.c
libavcodec/ffv1enc.c
libavcodec/huffman.c
libavcodec/iff.c
libavcodec/yop.c
libavformat/mpc.c
libavformat/oggparseogm.c
libavformat/oggparsespeex.c
libavformat/oggparsevorbis.c
libavformat/tta.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"
  
@@@ -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"
@@@ -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 */
Simple merge
Simple merge
Simple merge
  **/
  
  #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"
Simple merge
Simple merge
   * 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;