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>

1 files changed, 5 insertions, 0 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;
+}