summaryrefslogtreecommitdiff
path: root/libavcodec/encode.c
diff options
context:
space:
mode:
Diffstat (limited to 'libavcodec/encode.c')
-rw-r--r--libavcodec/encode.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/encode.c b/libavcodec/encode.c
index 29f41c3f92..282337e453 100644
--- a/libavcodec/encode.c
+++ b/libavcodec/encode.c
@@ -152,6 +152,10 @@ static int encode_simple_internal(AVCodecContext *avctx, AVPacket *avpkt)
if (CONFIG_FRAME_THREAD_ENCODER &&
avci->frame_thread_encoder && (avctx->active_thread_type & FF_THREAD_FRAME))
+ /* This might modify frame, but it doesn't matter, because
+ * the frame properties used below are not used for video
+ * (due to the delay inherent in frame threaded encoding, it makes
+ * no sense to use the properties of the current frame anyway). */
ret = ff_thread_video_encode_frame(avctx, avpkt, frame, &got_packet);
else {
ret = avctx->codec->encode2(avctx, avpkt, frame, &got_packet);