aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Daniel Dupas <devlists@shadowlab.org>2010-06-26 14:24:14 +0000
committerReinhard Tartler <siretart@tauware.de>2010-06-26 14:24:14 +0000
commit32fa7cecd7a1585094586d53f513f260a9271891 (patch)
tree7ccad47b81e8661c14e73e3e1bcd80f2eb521a86
parentb9ebd7dc7d6e22f2c2bcbc8709897fe44798146a (diff)
downloadffmpeg-32fa7cecd7a1585094586d53f513f260a9271891.tar.gz
Some fields were incorrectly reset (to NULL) when calling avcodec_copy_context().
Patch by Jean-Daniel Dupas, devlists shadowlab org backport r23344 by cehoyos Originally committed as revision 23793 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
-rw-r--r--libavcodec/options.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/options.c b/libavcodec/options.c
index 6835352c30..97d705ebc0 100644
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -488,9 +488,6 @@ int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src)
dest->slice_offset = NULL;
dest->internal_buffer = NULL;
dest->hwaccel = NULL;
- dest->execute = NULL;
- dest->execute2 = NULL;
- dest->reget_buffer = NULL;
dest->thread_opaque = NULL;
/* reallocate values that should be allocated separately */