Commit f3ae90a5 authored by ramiro's avatar ramiro

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.


git-svn-id: file:///var/local/repositories/mplayer/trunk/libswscale@29415 b3059339-0415-0410-9bf9-f77b7e298cf2
parent 868da632
...@@ -28,13 +28,17 @@ ...@@ -28,13 +28,17 @@
#include "libavutil/avutil.h" #include "libavutil/avutil.h"
#include "libavutil/lfg.h" #include "libavutil/lfg.h"
#include "swscale.h" #include "swscale.h"
#include "swscale_internal.h"
#undef fprintf /* HACK Duplicated from swscale_internal.h.
#undef free * Should be removed when a cleaner pixel format system exists. */
#undef malloc const char *sws_format_name(enum PixelFormat format);
#undef perror #define isALPHA(x) ( \
#undef printf (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){ static uint64_t getSSD(uint8_t *src1, uint8_t *src2, int stride1, int stride2, int w, int h){
int x,y; int x,y;
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#endif #endif
#include "libavutil/avutil.h" #include "libavutil/avutil.h"
#include "libavutil/internal.h"
#define STR(s) AV_TOSTRING(s) //AV_STRINGIFY is too long #define STR(s) AV_TOSTRING(s) //AV_STRINGIFY is too long
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment