[FFmpeg-devel] [PATCH] lavc/options: don't copy priv context when it is not AVOption object

[Lukasz Marek]

This prevents potential crash when opt API is used without a class.

Signed-off-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
---
 libavcodec/options.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/options.c b/libavcodec/options.c
index 7f9fb07..42ef754 100644
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -196,7 +196,7 @@ int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src)
 
     dest->priv_data       = orig_priv_data;
 
-    if (orig_priv_data)
+    if (orig_priv_data && src->codec && src->codec->priv_class)
         av_opt_copy(orig_priv_data, src->priv_data);
 
     dest->codec           = orig_codec;
-- 
1.9.1