mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-21 10:55:51 +02:00
avutil/mem: Don't include avutil.h
It is not necessary at all. So remove it. This also breaks an inclusion cycle mem.h->avutil.h->common.h->mem.h. Reviewed-by: Paul B Mahol <onemda@gmail.com> Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
parent
c3e3ea3c88
commit
e3b355c0be
@ -16,13 +16,14 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#include <stddef.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "libavutil/attributes.h"
|
||||
#include "libavutil/macros.h"
|
||||
#include "libavutil/mem.h"
|
||||
#include "libavutil/tx.h"
|
||||
#include "avfft.h"
|
||||
#include "fft.h"
|
||||
#include "rdft.h"
|
||||
#include "dct.h"
|
||||
|
||||
typedef struct AVTXWrapper {
|
||||
AVTXContext *ctx;
|
||||
|
@ -22,6 +22,7 @@
|
||||
#include <string.h>
|
||||
|
||||
#include "libavutil/avassert.h"
|
||||
#include "libavutil/avutil.h"
|
||||
#include "libavutil/intreadwrite.h"
|
||||
#include "libavutil/mathematics.h"
|
||||
#include "libavutil/mem.h"
|
||||
|
@ -21,6 +21,7 @@
|
||||
|
||||
#include "libavutil/attributes.h"
|
||||
#include "libavutil/common.h"
|
||||
#include "libavutil/log.h"
|
||||
#include "dirac_dwt.h"
|
||||
|
||||
#define TEMPLATE_8bit
|
||||
|
@ -25,6 +25,7 @@
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "libavutil/bprint.h"
|
||||
#include "libavutil/error.h"
|
||||
#include "libavutil/log.h"
|
||||
#include "libavutil/mem.h"
|
||||
|
||||
|
@ -26,8 +26,12 @@
|
||||
|
||||
#include <math.h>
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include "libavutil/attributes.h"
|
||||
#include "libavutil/common.h"
|
||||
#include "libavutil/log.h"
|
||||
#include "libavutil/mem.h"
|
||||
|
||||
#include "iirfilter.h"
|
||||
|
||||
|
@ -28,6 +28,7 @@
|
||||
#include <stddef.h>
|
||||
#include "libavutil/internal.h"
|
||||
#include "libavutil/intmath.h"
|
||||
#include "libavutil/log.h"
|
||||
#include "jpegls.h"
|
||||
|
||||
void ff_jpegls_init_state(JLSState *state)
|
||||
|
@ -17,6 +17,8 @@
|
||||
*/
|
||||
|
||||
#include "libavutil/avassert.h"
|
||||
#include "libavutil/error.h"
|
||||
#include "libavutil/libm.h"
|
||||
#include "libavutil/mathematics.h"
|
||||
#include "libavutil/attributes.h"
|
||||
#include "libavutil/mem.h"
|
||||
|
@ -27,7 +27,7 @@
|
||||
*/
|
||||
|
||||
#include <string.h>
|
||||
#include "libavutil/intmath.h"
|
||||
#include "libavutil/common.h"
|
||||
#include "mpegaudiodsp.h"
|
||||
|
||||
#include "mpc.h"
|
||||
|
@ -19,6 +19,8 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include "config.h"
|
||||
#include "libavutil/attributes.h"
|
||||
#include "libavutil/cpu.h"
|
||||
|
@ -16,7 +16,11 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#include "libavutil/common.h"
|
||||
#include <inttypes.h>
|
||||
#include <stddef.h>
|
||||
|
||||
#include "libavutil/log.h"
|
||||
#include "libavutil/macros.h"
|
||||
#include "libavcodec/h264_levels.h"
|
||||
|
||||
static const struct {
|
||||
|
@ -16,6 +16,8 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include "libavutil/avstring.h"
|
||||
#include "libavutil/log.h"
|
||||
#include "libavutil/mem.h"
|
||||
|
@ -18,13 +18,15 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#include <inttypes.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "avassert.h"
|
||||
#include "avstring.h"
|
||||
#include "dict.h"
|
||||
#include "dict_internal.h"
|
||||
#include "internal.h"
|
||||
#include "error.h"
|
||||
#include "mem.h"
|
||||
#include "time_internal.h"
|
||||
#include "bprint.h"
|
||||
|
@ -16,6 +16,8 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include "encryption_info.h"
|
||||
#include "mem.h"
|
||||
#include "intreadwrite.h"
|
||||
|
@ -293,6 +293,7 @@ void av_fifo_freep2(AVFifo **f)
|
||||
|
||||
|
||||
#if FF_API_FIFO_OLD_API
|
||||
#include "internal.h"
|
||||
FF_DISABLE_DEPRECATION_WARNINGS
|
||||
#define OLD_FIFO_SIZE_MAX (size_t)FFMIN3(INT_MAX, UINT32_MAX, SIZE_MAX)
|
||||
|
||||
|
@ -17,6 +17,7 @@
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include "error.h"
|
||||
#include "file.h"
|
||||
#include "file_open.h"
|
||||
#include "internal.h"
|
||||
|
@ -20,6 +20,8 @@
|
||||
|
||||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include "hash.h"
|
||||
|
||||
#include "adler32.h"
|
||||
|
@ -23,6 +23,7 @@
|
||||
#include <string.h>
|
||||
|
||||
#include "attributes.h"
|
||||
#include "error.h"
|
||||
#include "hmac.h"
|
||||
#include "md5.h"
|
||||
#include "sha.h"
|
||||
|
@ -31,9 +31,11 @@
|
||||
*/
|
||||
|
||||
#include <stdint.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "bswap.h"
|
||||
#include "intreadwrite.h"
|
||||
#include "macros.h"
|
||||
#include "mem.h"
|
||||
#include "md5.h"
|
||||
|
||||
|
@ -27,12 +27,10 @@
|
||||
#ifndef AVUTIL_MEM_H
|
||||
#define AVUTIL_MEM_H
|
||||
|
||||
#include <limits.h>
|
||||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
|
||||
#include "attributes.h"
|
||||
#include "avutil.h"
|
||||
#include "version.h"
|
||||
|
||||
/**
|
||||
* @addtogroup lavu_mem
|
||||
|
@ -20,6 +20,7 @@
|
||||
|
||||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
#include <string.h>
|
||||
#include "mem.h"
|
||||
#include "intreadwrite.h"
|
||||
#include "murmur3.h"
|
||||
|
@ -19,6 +19,8 @@
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <lzo/lzo1x.h>
|
||||
|
||||
#include "libavutil/log.h"
|
||||
|
@ -18,6 +18,9 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#include <inttypes.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include "libavutil/intreadwrite.h"
|
||||
#include "libavutil/mem.h"
|
||||
#include "libavutil/murmur3.h"
|
||||
|
@ -19,6 +19,7 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#include "libavutil/log.h"
|
||||
#include "libavutil/pixdesc.c"
|
||||
|
||||
int main(void){
|
||||
|
@ -19,6 +19,9 @@
|
||||
*/
|
||||
|
||||
#include <limits.h>
|
||||
#include <stddef.h>
|
||||
|
||||
#include "error.h"
|
||||
#include "fifo.h"
|
||||
#include "mem.h"
|
||||
#include "threadmessage.h"
|
||||
|
@ -24,7 +24,7 @@
|
||||
#ifndef AVUTIL_TIMESTAMP_H
|
||||
#define AVUTIL_TIMESTAMP_H
|
||||
|
||||
#include "common.h"
|
||||
#include "avutil.h"
|
||||
|
||||
#if defined(__cplusplus) && !defined(__STDC_FORMAT_MACROS) && !defined(PRId64)
|
||||
#error missing -D__STDC_FORMAT_MACROS / #define __STDC_FORMAT_MACROS
|
||||
|
@ -22,6 +22,7 @@
|
||||
#include "tx.h"
|
||||
#include "thread.h"
|
||||
#include "mem_internal.h"
|
||||
#include "common.h"
|
||||
#include "attributes.h"
|
||||
|
||||
#ifdef TX_FLOAT
|
||||
|
@ -21,6 +21,8 @@
|
||||
|
||||
#ifdef _WIN32
|
||||
|
||||
#include <errno.h>
|
||||
#include <stddef.h>
|
||||
#include <windows.h>
|
||||
#include "mem.h"
|
||||
|
||||
|
@ -19,11 +19,15 @@
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#if HAVE_UNISTD_H
|
||||
#include <unistd.h> /* getopt */
|
||||
#endif
|
||||
|
||||
#include "libavutil/error.h"
|
||||
#include "libavutil/eval.h"
|
||||
#include "libavutil/log.h"
|
||||
#include "libavutil/mem.h"
|
||||
|
||||
#if !HAVE_GETOPT
|
||||
|
@ -20,8 +20,11 @@
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <zmq.h>
|
||||
|
||||
#include "libavutil/log.h"
|
||||
#include "libavutil/mem.h"
|
||||
#include "libavutil/bprint.h"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user