Merge commit '074c769de93bf12e9f44d77e58a8c7167f9dfb13'

[ffmpeg] / libavcodec / options.c

diff --git a/libavcodec/options.c b/libavcodec/options.c
index 266a7f1297b3ddfe9d4b7dff7444547099aa9c12..5ee9d6bd73910f99e5cf03871c0e7c108063b138 100644 (file)
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -173,7 +173,6 @@ int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src)
     dest->codec           = NULL;
     dest->slice_offset    = NULL;
     dest->hwaccel         = NULL;
-    dest->thread_opaque   = NULL;
     dest->internal        = NULL;
 
     /* reallocate values that should be allocated separately */