Merge remote-tracking branch 'qatar/master'

[coroid/ffmpeg_saccubus.git] / libavcodec / options.c

diff --git a/libavcodec/options.c b/libavcodec/options.c
index f481ad5..728e676 100644 (file)
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -44,7 +44,7 @@ static const AVOption *opt_find(void *obj, const char *name, const char *unit, i
     AVCodecContext *s = obj;
     AVCodec        *c = NULL;
 
-    if (s->priv_data) {
+    if (!(search_flags & AV_OPT_SEARCH_FAKE_OBJ) && s->priv_data) {
         if (s->codec && s->codec->priv_class)
             return av_opt_find(s->priv_data, name, unit, opt_flags, search_flags);
         return NULL;
@@ -662,3 +662,8 @@ fail:
     av_freep(&dest->rc_eq);
     return AVERROR(ENOMEM);
 }
+
+const AVClass *avcodec_get_class(void)
+{
+    return &av_codec_context_class;
+}