summaryrefslogtreecommitdiff
path: root/libavcodec/motion_est.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-12-02 10:43:08 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-12-02 10:43:08 +0000
commita6f2c0d6e5ccedf2f25c1ea9d83fc646e644ef52 (patch)
tree9acc7c507e467af9c805b7a034f9ad2f4db140fb /libavcodec/motion_est.c
parent1599c47ce32a993f3db3b352e313385325449e21 (diff)
Fix regression test failure with pthreads on multiprocessor systems.
Fixes issue517 Originally committed as revision 15976 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/motion_est.c')
-rw-r--r--libavcodec/motion_est.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c
index 7c1fc677d2..d9d48a643e 100644
--- a/libavcodec/motion_est.c
+++ b/libavcodec/motion_est.c
@@ -307,8 +307,6 @@ int ff_init_me(MpegEncContext *s){
c->sub_motion_search= no_sub_motion_search;
}
- c->temp= c->scratchpad;
-
return 0;
}