diff options
| author | Michael Niedermayer <[email protected]> | 2015-05-25 04:54:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-06-17 21:50:08 +0200 |
| commit | 4f09968865a0682aae0d0945f24560c29181630e (patch) | |
| tree | e06bce267d9cb0203e3716cb3ae9bee0b8e5feaa | |
| parent | 9d6d4eb4254253b012658d3eb95e674c6d70abe4 (diff) | |
avcodec/mpegvideo_enc: Update the buffer size as more slices are merged
Signed-off-by: Michael Niedermayer <[email protected]>
(cherry picked from commit 561d3a57aaa95c7e8e65e96b36dd069100603650)
Signed-off-by: Michael Niedermayer <[email protected]>
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index b7bb786337..3ea47f6027 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -3610,6 +3610,8 @@ static int encode_picture(MpegEncContext *s, int picture_number) } s->avctx->execute(s->avctx, encode_thread, &s->thread_context[0], NULL, context_count, sizeof(void*)); for(i=1; i<context_count; i++){ + if (s->pb.buf_end == s->thread_context[i]->pb.buf) + set_put_bits_buffer_size(&s->pb, FFMIN(s->thread_context[i]->pb.buf_end - s->pb.buf, INT_MAX/8-32)); merge_context_after_encode(s, s->thread_context[i]); } emms_c(); |