ffprobe: stop setting AVCodecContext.framerate

[ffmpeg] / libavcodec / encode.c

diff --git a/libavcodec/encode.c b/libavcodec/encode.c
index 29f41c3f920f99903b38ca0ab1bd17f538dc5d53..282337e4536ad6b1a1c3784a7174ae5e193fe95e 100644 (file)
--- 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);