diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-04 04:11:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-04 04:11:53 +0200 |
| commit | 1889c6724a449b2e4826612d3b72efc76dbfb713 (patch) | |
| tree | 05abce06cd1151955b1f1280721044584012ee51 /libswscale | |
| parent | ca4d71b149ebe32aeaf617ffccf362624b9aafb1 (diff) | |
| parent | e955a682e125d44143415ff2b96a99a4dac78da2 (diff) | |
| download | ffmpeg-1889c6724a449b2e4826612d3b72efc76dbfb713.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
AVOptions: fix av_set_string3() doxy to match reality.
cmdutils: get rid of dummy contexts for examining AVOptions.
lavf,lavc,sws: add {avcodec,avformat,sws}_get_class() functions.
AVOptions: add AV_OPT_SEARCH_FAKE_OBJ flag for av_opt_find().
cpu detection: avoid a signed overflow
Conflicts:
avconv.c
cmdutils.c
doc/APIchanges
ffmpeg.c
libavcodec/options.c
libavcodec/version.h
libavformat/version.h
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/options.c | 5 | ||||
| -rw-r--r-- | libswscale/swscale.h | 9 |
2 files changed, 13 insertions, 1 deletions
diff --git a/libswscale/options.c b/libswscale/options.c index 010c68ecbe..23cc8bb597 100644 --- a/libswscale/options.c +++ b/libswscale/options.c @@ -67,3 +67,8 @@ static const AVOption options[] = { }; const AVClass sws_context_class = { "SWScaler", sws_context_to_name, options }; + +const AVClass *sws_get_class(void) +{ + return &sws_context_class; +} diff --git a/libswscale/swscale.h b/libswscale/swscale.h index f84e8798be..bdde675a8d 100644 --- a/libswscale/swscale.h +++ b/libswscale/swscale.h @@ -32,7 +32,7 @@ #include "libavutil/pixfmt.h" #define LIBSWSCALE_VERSION_MAJOR 2 -#define LIBSWSCALE_VERSION_MINOR 0 +#define LIBSWSCALE_VERSION_MINOR 1 #define LIBSWSCALE_VERSION_MICRO 0 #define LIBSWSCALE_VERSION_INT AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \ @@ -354,5 +354,12 @@ void sws_convertPalette8ToPacked32(const uint8_t *src, uint8_t *dst, int num_pix */ void sws_convertPalette8ToPacked24(const uint8_t *src, uint8_t *dst, int num_pixels, const uint8_t *palette); +/** + * Get the AVClass for swsContext. It can be used in combination with + * AV_OPT_SEARCH_FAKE_OBJ for examining options. + * + * @see av_opt_find(). + */ +const AVClass *sws_get_class(void); #endif /* SWSCALE_SWSCALE_H */ |