Mercurial > mplayer.hg
changeset 29373:c2c83f344012
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.
| author | ramiro |
|---|---|
| date | Thu, 09 Jul 2009 02:27:39 +0000 |
| parents | 04506b0477af |
| children | d54b8d82ac3c |
| files | libswscale/swscale-example.c libswscale/swscale_internal.h |
| diffstat | 2 files changed, 10 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/libswscale/swscale-example.c Tue Jul 07 02:49:26 2009 +0000 +++ b/libswscale/swscale-example.c Thu Jul 09 02:27:39 2009 +0000 @@ -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;