summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-30 21:00:34 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-30 21:24:55 +0200
commite0d074556055e8d2ed706be100e26d7bb6864d6e (patch)
treea431e999cb1ba9ac864916b4a885f36e3f09f862 /libavcodec
parent82efa24c519acbd73c4b7ed07406ee0b4c8cf091 (diff)
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@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/options.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/options.c b/libavcodec/options.c
index 694e1c3f3b..0026f88b89 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));