diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-16 02:39:58 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-16 02:39:58 +0200 |
commit | 0bf2bd91ec69dfd908d78557a17f38e0904a52e7 (patch) | |
tree | bf9e5e145ff802e7b5ff7b9ab387bfc3ba0331d7 /libswscale/swscale.h | |
parent | 738f66b1bc98073d74af7031c4454322157a15ec (diff) | |
parent | eacf4421f4fe16674aefe8b628321188c4912521 (diff) | |
download | mpv-0bf2bd91ec69dfd908d78557a17f38e0904a52e7.tar.bz2 mpv-0bf2bd91ec69dfd908d78557a17f38e0904a52e7.tar.xz |
Merge svn changes up to r28610
Diffstat (limited to 'libswscale/swscale.h')
-rw-r--r-- | libswscale/swscale.h | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/libswscale/swscale.h b/libswscale/swscale.h index 35db84cdef..b29244da03 100644 --- a/libswscale/swscale.h +++ b/libswscale/swscale.h @@ -30,8 +30,8 @@ #include "libavutil/avutil.h" #define LIBSWSCALE_VERSION_MAJOR 0 -#define LIBSWSCALE_VERSION_MINOR 6 -#define LIBSWSCALE_VERSION_MICRO 2 +#define LIBSWSCALE_VERSION_MINOR 7 +#define LIBSWSCALE_VERSION_MICRO 0 #define LIBSWSCALE_VERSION_INT AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \ LIBSWSCALE_VERSION_MINOR, \ @@ -165,6 +165,11 @@ SwsVector *sws_getIdentityVec(void); * Scales all the coefficients of \p a by the \p scalar value. */ void sws_scaleVec(SwsVector *a, double scalar); + +/** + * Scales all the coefficients of \p a so that their sum equals \p + * height." + */ void sws_normalizeVec(SwsVector *a, double height); void sws_convVec(SwsVector *a, SwsVector *b); void sws_addVec(SwsVector *a, SwsVector *b); @@ -177,7 +182,19 @@ void sws_shiftVec(SwsVector *a, int shift); */ SwsVector *sws_cloneVec(SwsVector *a); -void sws_printVec(SwsVector *a); +#if LIBSWSCALE_VERSION_MAJOR < 1 +/** + * @deprecated Use sws_printVec2() instead. + */ +attribute_deprecated void sws_printVec(SwsVector *a); +#endif + +/** + * Prints with av_log() a textual representation of the vector \p a + * if \p log_level <= av_log_level. + */ +void sws_printVec2(SwsVector *a, AVClass *log_ctx, int log_level); + void sws_freeVec(SwsVector *a); SwsFilter *sws_getDefaultFilter(float lumaGBlur, float chromaGBlur, |