diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-09-03 10:16:30 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-09-03 10:16:30 +0300 |
| commit | b56858342fdbe48489618107df75e5bd0451eb0b (patch) | |
| tree | 5d41ef858502bae99dcbebdd728d42a6040adb03 /libswscale | |
| parent | 8ea7eb77fc7ba8bd0b596ea32ee60909a012828f (diff) | |
| parent | bae94777d7ddaa2d4763507fdb93b9520327c9d1 (diff) | |
| download | mpv-b56858342fdbe48489618107df75e5bd0451eb0b.tar.bz2 mpv-b56858342fdbe48489618107df75e5bd0451eb0b.tar.xz | |
Merge svn changes up to r27514
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/rgb2rgb.h | 6 | ||||
| -rw-r--r-- | libswscale/swscale.c | 5 | ||||
| -rw-r--r-- | libswscale/swscale.h | 13 | ||||
| -rw-r--r-- | libswscale/swscale_internal.h | 6 |
4 files changed, 20 insertions, 10 deletions
diff --git a/libswscale/rgb2rgb.h b/libswscale/rgb2rgb.h index f2697c65d6..cded1b3557 100644 --- a/libswscale/rgb2rgb.h +++ b/libswscale/rgb2rgb.h @@ -23,8 +23,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_RGB2RGB_H -#define FFMPEG_RGB2RGB_H +#ifndef SWSCALE_RGB2RGB_H +#define SWSCALE_RGB2RGB_H #include <inttypes.h> @@ -139,4 +139,4 @@ extern void (*yvu9_to_yuy2)(const uint8_t *src1, const uint8_t *src2, const uint void sws_rgb2rgb_init(int flags); -#endif /* FFMPEG_RGB2RGB_H */ +#endif /* SWSCALE_RGB2RGB_H */ diff --git a/libswscale/swscale.c b/libswscale/swscale.c index ccdeae8185..891f79ac28 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -73,6 +73,11 @@ untested special converters #include "libavutil/x86_cpu.h" #include "libavutil/bswap.h" +unsigned swscale_version(void) +{ + return LIBSWSCALE_VERSION_INT; +} + #undef MOVNTQ #undef PAVGB diff --git a/libswscale/swscale.h b/libswscale/swscale.h index a0c735b696..98e9b2ee0e 100644 --- a/libswscale/swscale.h +++ b/libswscale/swscale.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_SWSCALE_H -#define FFMPEG_SWSCALE_H +#ifndef SWSCALE_SWSCALE_H +#define SWSCALE_SWSCALE_H /** * @file swscale.h @@ -30,7 +30,7 @@ #include "libavutil/avutil.h" #define LIBSWSCALE_VERSION_MAJOR 0 -#define LIBSWSCALE_VERSION_MINOR 5 +#define LIBSWSCALE_VERSION_MINOR 6 #define LIBSWSCALE_VERSION_MICRO 1 #define LIBSWSCALE_VERSION_INT AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \ @@ -43,6 +43,11 @@ #define LIBSWSCALE_IDENT "SwS" AV_STRINGIFY(LIBSWSCALE_VERSION) +/** + * Returns the LIBSWSCALE_VERSION_INT constant. + */ +unsigned swscale_version(void); + /* values for the flags, the stuff on the command line is different */ #define SWS_FAST_BILINEAR 1 #define SWS_BILINEAR 2 @@ -143,4 +148,4 @@ struct SwsContext *sws_getCachedContext(struct SwsContext *context, int dstW, int dstH, int dstFormat, int flags, SwsFilter *srcFilter, SwsFilter *dstFilter, double *param); -#endif /* FFMPEG_SWSCALE_H */ +#endif /* SWSCALE_SWSCALE_H */ diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index e904205475..a20b26ef5a 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_SWSCALE_INTERNAL_H -#define FFMPEG_SWSCALE_INTERNAL_H +#ifndef SWSCALE_SWSCALE_INTERNAL_H +#define SWSCALE_SWSCALE_INTERNAL_H #include "config.h" @@ -280,4 +280,4 @@ extern const DECLARE_ALIGNED(8, uint64_t, ff_dither8[2]); extern const AVClass sws_context_class; -#endif /* FFMPEG_SWSCALE_INTERNAL_H */ +#endif /* SWSCALE_SWSCALE_INTERNAL_H */ |