diff options
author | ramiro <ramiro@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-07-09 02:27:39 +0000 |
---|---|---|
committer | ramiro <ramiro@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-07-09 02:27:39 +0000 |
commit | 1351150b15268a9b6c7cb557ba895500f62c325d (patch) | |
tree | adda82548c7be0b4a4c25e7f8132b2af4abad5c5 /libswscale | |
parent | edad3fb8c2705fc2f177d7780849b630f81c0224 (diff) | |
download | mpv-1351150b15268a9b6c7cb557ba895500f62c325d.tar.bz2 mpv-1351150b15268a9b6c7cb557ba895500f62c325d.tar.xz |
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: svn://svn.mplayerhq.hu/mplayer/trunk@29415 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libswscale')
-rw-r--r-- | libswscale/swscale-example.c | 16 | ||||
-rw-r--r-- | libswscale/swscale_internal.h | 1 |
2 files changed, 10 insertions, 7 deletions
diff --git a/libswscale/swscale-example.c b/libswscale/swscale-example.c index c9916e5489..f90e2f3f6f 100644 --- a/libswscale/swscale-example.c +++ b/libswscale/swscale-example.c @@ -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; diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 60a08a7849..871575e437 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -28,7 +28,6 @@ #endif #include "libavutil/avutil.h" -#include "libavutil/internal.h" #define STR(s) AV_TOSTRING(s) //AV_STRINGIFY is too long |