Commit 9204a849 authored by Clément Bœsch's avatar Clément Bœsch

Merge commit '5c31eaa9'

* commit '5c31eaa9':
  Remove unnecessary get_bits.h #includes and add missing headers where needed.
Merged-by: 's avatarClément Bœsch <clement@stupeflix.com>
parents 3801060c 5c31eaa9
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include "libavutil/common.h" #include "libavutil/common.h"
#include "libavutil/timer.h" #include "libavutil/timer.h"
#include "get_bits.h"
#include "cabac.h" #include "cabac.h"
#include "cabac_functions.h" #include "cabac_functions.h"
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
#include "libavutil/timer.h" #include "libavutil/timer.h"
#include "avcodec.h" #include "avcodec.h"
#include "internal.h" #include "internal.h"
#include "put_bits.h" #include "put_bits.h"
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include "libavutil/qsort.h" #include "libavutil/qsort.h"
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h"
#include "huffman.h" #include "huffman.h"
/* symbol for Huffman tree node */ /* symbol for Huffman tree node */
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <stdint.h> #include <stdint.h>
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "bytestream.h" #include "bytestream.h"
#include "avcodec.h" #include "avcodec.h"
#include "internal.h" #include "internal.h"
......
...@@ -22,11 +22,13 @@ ...@@ -22,11 +22,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/intreadwrite.h" #include <string.h>
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "libavutil/internal.h"
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h"
#include "internal.h" #include "internal.h"
typedef struct YopDecContext { typedef struct YopDecContext {
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
*/ */
#include "libavutil/channel_layout.h" #include "libavutil/channel_layout.h"
#include "libavcodec/get_bits.h"
#include "avformat.h" #include "avformat.h"
#include "internal.h" #include "internal.h"
#include "apetag.h" #include "apetag.h"
......
...@@ -23,10 +23,12 @@ ...@@ -23,10 +23,12 @@
**/ **/
#include <stdlib.h> #include <stdlib.h>
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavcodec/get_bits.h"
#include "libavcodec/bytestream.h" #include "libavcodec/bytestream.h"
#include "avformat.h" #include "avformat.h"
#include "internal.h" #include "internal.h"
#include "oggdec.h" #include "oggdec.h"
......
...@@ -23,11 +23,13 @@ ...@@ -23,11 +23,13 @@
**/ **/
#include <stdlib.h> #include <stdlib.h>
#include "libavutil/bswap.h" #include "libavutil/bswap.h"
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavutil/channel_layout.h" #include "libavutil/channel_layout.h"
#include "libavcodec/get_bits.h"
#include "libavcodec/bytestream.h" #include "libavcodec/bytestream.h"
#include "avformat.h" #include "avformat.h"
#include "internal.h" #include "internal.h"
#include "oggdec.h" #include "oggdec.h"
......
...@@ -28,9 +28,10 @@ ...@@ -28,9 +28,10 @@
#include "libavutil/base64.h" #include "libavutil/base64.h"
#include "libavutil/bswap.h" #include "libavutil/bswap.h"
#include "libavutil/dict.h" #include "libavutil/dict.h"
#include "libavcodec/bytestream.h" #include "libavcodec/bytestream.h"
#include "libavcodec/get_bits.h"
#include "libavcodec/vorbis_parser.h" #include "libavcodec/vorbis_parser.h"
#include "avformat.h" #include "avformat.h"
#include "flac_picture.h" #include "flac_picture.h"
#include "internal.h" #include "internal.h"
......
...@@ -19,14 +19,15 @@ ...@@ -19,14 +19,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * 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 "apetag.h"
#include "avformat.h" #include "avformat.h"
#include "avio_internal.h" #include "avio_internal.h"
#include "internal.h" #include "internal.h"
#include "id3v1.h" #include "id3v1.h"
#include "libavutil/crc.h"
#include "libavutil/dict.h"
typedef struct TTAContext { typedef struct TTAContext {
int totalframes, currentframe; int totalframes, currentframe;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment