mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Merge commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec'
* commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec': avutil: remove timer.h include from internal.h Conflicts: libavcodec/ffv1dec.c libavutil/internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
965fa6b0d9
@ -27,6 +27,7 @@
|
||||
#include <string.h>
|
||||
|
||||
#include "libavutil/common.h"
|
||||
#include "libavutil/timer.h"
|
||||
#include "get_bits.h"
|
||||
#include "cabac.h"
|
||||
#include "cabac_functions.h"
|
||||
|
@ -23,6 +23,7 @@
|
||||
*/
|
||||
|
||||
#include "libavutil/imgutils.h"
|
||||
#include "libavutil/timer.h"
|
||||
#include "avcodec.h"
|
||||
#include "get_bits.h"
|
||||
#include "dnxhddata.h"
|
||||
|
@ -28,6 +28,7 @@
|
||||
#include "libavutil/attributes.h"
|
||||
#include "libavutil/internal.h"
|
||||
#include "libavutil/opt.h"
|
||||
#include "libavutil/timer.h"
|
||||
#include "avcodec.h"
|
||||
#include "dsputil.h"
|
||||
#include "internal.h"
|
||||
|
@ -31,6 +31,7 @@
|
||||
#include "libavutil/imgutils.h"
|
||||
#include "libavutil/opt.h"
|
||||
#include "libavutil/stereo3d.h"
|
||||
#include "libavutil/timer.h"
|
||||
#include "internal.h"
|
||||
#include "cabac.h"
|
||||
#include "cabac_functions.h"
|
||||
|
@ -29,6 +29,7 @@
|
||||
#define UNCHECKED_BITSTREAM_READER 1
|
||||
|
||||
#include "libavutil/attributes.h"
|
||||
#include "libavutil/timer.h"
|
||||
#include "config.h"
|
||||
#include "cabac.h"
|
||||
#include "cabac_functions.h"
|
||||
|
@ -28,6 +28,7 @@
|
||||
|
||||
#define BITSTREAM_READER_LE
|
||||
#include "libavutil/attributes.h"
|
||||
#include "libavutil/timer.h"
|
||||
#include "avcodec.h"
|
||||
#include "get_bits.h"
|
||||
#include "internal.h"
|
||||
|
@ -31,6 +31,7 @@
|
||||
#include "libavutil/avassert.h"
|
||||
#include "libavutil/imgutils.h"
|
||||
#include "libavutil/internal.h"
|
||||
#include "libavutil/timer.h"
|
||||
#include "avcodec.h"
|
||||
#include "dsputil.h"
|
||||
#include "h264chroma.h"
|
||||
|
@ -34,6 +34,7 @@
|
||||
#include "libavutil/mathematics.h"
|
||||
#include "libavutil/pixdesc.h"
|
||||
#include "libavutil/opt.h"
|
||||
#include "libavutil/timer.h"
|
||||
#include "avcodec.h"
|
||||
#include "dct.h"
|
||||
#include "dsputil.h"
|
||||
|
@ -23,6 +23,7 @@
|
||||
#include "common.h"
|
||||
#include "aes.h"
|
||||
#include "intreadwrite.h"
|
||||
#include "timer.h"
|
||||
|
||||
typedef union {
|
||||
uint64_t u64[2];
|
||||
|
@ -27,6 +27,7 @@
|
||||
#include "common.h"
|
||||
#include "base64.h"
|
||||
#include "intreadwrite.h"
|
||||
#include "timer.h"
|
||||
|
||||
/* ---------------- private code */
|
||||
static const uint8_t map2[256] =
|
||||
|
@ -35,6 +35,7 @@
|
||||
#include "mathematics.h"
|
||||
#include "time.h"
|
||||
#include "avstring.h"
|
||||
#include "timer.h"
|
||||
|
||||
typedef struct Parser {
|
||||
const AVClass *class;
|
||||
|
@ -36,7 +36,6 @@
|
||||
#include <assert.h>
|
||||
#include "config.h"
|
||||
#include "attributes.h"
|
||||
#include "timer.h"
|
||||
#include "cpu.h"
|
||||
#include "dict.h"
|
||||
#include "version.h"
|
||||
|
Loading…
Reference in New Issue
Block a user