mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Do not include pixfmt.h in avutil.h
Signed-off-by: Mans Rullgard <mans@mansr.com>
This commit is contained in:
parent
e91709ca17
commit
d49ea4afb4
@ -30,6 +30,7 @@
|
|||||||
#include "libavutil/samplefmt.h"
|
#include "libavutil/samplefmt.h"
|
||||||
#include "libavutil/avutil.h"
|
#include "libavutil/avutil.h"
|
||||||
#include "libavutil/cpu.h"
|
#include "libavutil/cpu.h"
|
||||||
|
#include "libavutil/pixfmt.h"
|
||||||
#include "libavutil/rational.h"
|
#include "libavutil/rational.h"
|
||||||
|
|
||||||
#include "libavcodec/version.h"
|
#include "libavcodec/version.h"
|
||||||
|
@ -24,6 +24,7 @@
|
|||||||
|
|
||||||
#include "libavutil/avutil.h"
|
#include "libavutil/avutil.h"
|
||||||
#include "libavutil/samplefmt.h"
|
#include "libavutil/samplefmt.h"
|
||||||
|
#include "libavutil/pixfmt.h"
|
||||||
#include "libavutil/rational.h"
|
#include "libavutil/rational.h"
|
||||||
|
|
||||||
#define LIBAVFILTER_VERSION_MAJOR 2
|
#define LIBAVFILTER_VERSION_MAJOR 2
|
||||||
|
@ -122,6 +122,5 @@ char av_get_picture_type_char(enum AVPictureType pict_type);
|
|||||||
#include "common.h"
|
#include "common.h"
|
||||||
#include "error.h"
|
#include "error.h"
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
#include "pixfmt.h"
|
|
||||||
|
|
||||||
#endif /* AVUTIL_AVUTIL_H */
|
#endif /* AVUTIL_AVUTIL_H */
|
||||||
|
@ -28,6 +28,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "libavutil/avutil.h"
|
#include "libavutil/avutil.h"
|
||||||
|
#include "libavutil/pixfmt.h"
|
||||||
|
|
||||||
#define LIBSWSCALE_VERSION_MAJOR 2
|
#define LIBSWSCALE_VERSION_MAJOR 2
|
||||||
#define LIBSWSCALE_VERSION_MINOR 0
|
#define LIBSWSCALE_VERSION_MINOR 0
|
||||||
|
@ -28,6 +28,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "libavutil/avutil.h"
|
#include "libavutil/avutil.h"
|
||||||
|
#include "libavutil/pixfmt.h"
|
||||||
|
|
||||||
#define STR(s) AV_TOSTRING(s) //AV_STRINGIFY is too long
|
#define STR(s) AV_TOSTRING(s) //AV_STRINGIFY is too long
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user