mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-24 03:59:43 +00:00
Remove dependency from swscale_internal.h to lavu/internal.h, it is no longer
needed for DECLARE_ALIGNED. Remove dependency from swscale-example.c to swscale_internal.h by duplicating the necessary code. The duplicated code is a hack and should be removed once a cleaner pixel format information system exists. swscale-example.c is example code on how to use the library and therefore shouldn't rely on internal headers. Originally committed as revision 29415 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
This commit is contained in:
parent
16c2e21488
commit
71ed6c8f06
@ -28,13 +28,17 @@
|
||||
#include "libavutil/avutil.h"
|
||||
#include "libavutil/lfg.h"
|
||||
#include "swscale.h"
|
||||
#include "swscale_internal.h"
|
||||
|
||||
#undef fprintf
|
||||
#undef free
|
||||
#undef malloc
|
||||
#undef perror
|
||||
#undef printf
|
||||
/* HACK Duplicated from swscale_internal.h.
|
||||
* Should be removed when a cleaner pixel format system exists. */
|
||||
const char *sws_format_name(enum PixelFormat format);
|
||||
#define isALPHA(x) ( \
|
||||
(x)==PIX_FMT_BGR32 \
|
||||
|| (x)==PIX_FMT_BGR32_1 \
|
||||
|| (x)==PIX_FMT_RGB32 \
|
||||
|| (x)==PIX_FMT_RGB32_1 \
|
||||
|| (x)==PIX_FMT_YUVA420P \
|
||||
)
|
||||
|
||||
static uint64_t getSSD(uint8_t *src1, uint8_t *src2, int stride1, int stride2, int w, int h){
|
||||
int x,y;
|
||||
|
@ -28,7 +28,6 @@
|
||||
#endif
|
||||
|
||||
#include "libavutil/avutil.h"
|
||||
#include "libavutil/internal.h"
|
||||
|
||||
#define STR(s) AV_TOSTRING(s) //AV_STRINGIFY is too long
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user