[FFmpeg-cvslog] avcodec/options: leave priv_data in avcodec_copy_context() intact

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 30 21:00:34 2014 +0200| [e0d074556055e8d2ed706be100e26d7bb6864d6e] | committer: Michael Niedermayer

avcodec/options: leave priv_data in avcodec_copy_context() intact

previously it was freed but the pointer not cleared

Found-by: ruggles
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e0d074556055e8d2ed706be100e26d7bb6864d6e
---

 libavcodec/options.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/libavcodec/options.c b/libavcodec/options.c
index 694e1c3..0026f88 100644
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -182,7 +182,6 @@ int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src)
     }
 
     av_opt_free(dest);
-    av_free(dest->priv_data);
 
     memcpy(dest, src, sizeof(*dest));