mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
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>
This commit is contained in:
commit
9204a84998
@ -28,7 +28,7 @@
|
||||
|
||||
#include "libavutil/common.h"
|
||||
#include "libavutil/timer.h"
|
||||
#include "get_bits.h"
|
||||
|
||||
#include "cabac.h"
|
||||
#include "cabac_functions.h"
|
||||
|
||||
|
@ -32,6 +32,7 @@
|
||||
#include "libavutil/imgutils.h"
|
||||
#include "libavutil/pixdesc.h"
|
||||
#include "libavutil/timer.h"
|
||||
|
||||
#include "avcodec.h"
|
||||
#include "internal.h"
|
||||
#include "put_bits.h"
|
||||
|
@ -28,7 +28,6 @@
|
||||
|
||||
#include "libavutil/qsort.h"
|
||||
#include "avcodec.h"
|
||||
#include "get_bits.h"
|
||||
#include "huffman.h"
|
||||
|
||||
/* symbol for Huffman tree node */
|
||||
|
@ -29,6 +29,7 @@
|
||||
#include <stdint.h>
|
||||
|
||||
#include "libavutil/imgutils.h"
|
||||
|
||||
#include "bytestream.h"
|
||||
#include "avcodec.h"
|
||||
#include "internal.h"
|
||||
|
@ -22,11 +22,13 @@
|
||||
* 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/internal.h"
|
||||
#include "libavutil/intreadwrite.h"
|
||||
|
||||
#include "avcodec.h"
|
||||
#include "get_bits.h"
|
||||
#include "internal.h"
|
||||
|
||||
typedef struct YopDecContext {
|
||||
|
@ -20,7 +20,7 @@
|
||||
*/
|
||||
|
||||
#include "libavutil/channel_layout.h"
|
||||
#include "libavcodec/get_bits.h"
|
||||
|
||||
#include "avformat.h"
|
||||
#include "internal.h"
|
||||
#include "apetag.h"
|
||||
|
@ -23,10 +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"
|
||||
|
@ -23,11 +23,13 @@
|
||||
**/
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "libavutil/bswap.h"
|
||||
#include "libavutil/avstring.h"
|
||||
#include "libavutil/channel_layout.h"
|
||||
#include "libavcodec/get_bits.h"
|
||||
|
||||
#include "libavcodec/bytestream.h"
|
||||
|
||||
#include "avformat.h"
|
||||
#include "internal.h"
|
||||
#include "oggdec.h"
|
||||
|
@ -28,9 +28,10 @@
|
||||
#include "libavutil/base64.h"
|
||||
#include "libavutil/bswap.h"
|
||||
#include "libavutil/dict.h"
|
||||
|
||||
#include "libavcodec/bytestream.h"
|
||||
#include "libavcodec/get_bits.h"
|
||||
#include "libavcodec/vorbis_parser.h"
|
||||
|
||||
#include "avformat.h"
|
||||
#include "flac_picture.h"
|
||||
#include "internal.h"
|
||||
|
@ -19,14 +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;
|
||||
|
Loading…
Reference in New Issue
Block a user