aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/pthread.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-04-03 02:28:01 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-04-03 02:28:01 +0200
commitf35439699f5546774b840ae9fba7df82729ef0ff (patch)
tree92c22313b8eda656421372955598d647aa64242e /libavcodec/pthread.c
parent85c9365d65c4d03c468cead13f722ddce89d8495 (diff)
parentbc154882e11f4a218cc8cfb10ae0b4cbc83b5f9f (diff)
downloadffmpeg-f35439699f5546774b840ae9fba7df82729ef0ff.tar.gz
Merge remote branch 'qatar/master'
* qatar/master: Fixed-point MDCT with 32-bit unscaled output lavc: deprecate rate_emu lavc: mark hurry_up for removal on next major bump parser: mark av_parser_parse() for removal on next major bump lavc: add missing audioconvert includes jvdec: don't use deprecated CODEC_TYPE_*/PKT_FLAG_KEY Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pthread.c')
-rw-r--r--libavcodec/pthread.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index 380edaa4c5..da63234887 100644
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -380,7 +380,9 @@ static void update_context_from_user(AVCodecContext *dst, AVCodecContext *src)
dst->release_buffer = src->release_buffer;
dst->opaque = src->opaque;
+#if FF_API_HURRY_UP
dst->hurry_up = src->hurry_up;
+#endif
dst->dsp_mask = src->dsp_mask;
dst->debug = src->debug;
dst->debug_mv = src->debug_mv;