diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-07 14:51:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-07 14:59:37 +0200 |
| commit | 8324bd51867fdc8a79cbdb5850d36bfd0c741d3f (patch) | |
| tree | a89cdf7711c714832c158731ade0961273af1961 /libavcodec/mpegvideo_enc.c | |
| parent | 3be90723e704ad36396ff088747c84150ba842ed (diff) | |
| download | ffmpeg-8324bd51867fdc8a79cbdb5850d36bfd0c741d3f.tar.gz | |
avcodec/mpegvideo_enc: fix b frame strategy 2
Fixes Ticket3757
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo_enc.c')
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index ffd91a7ab8..7dbe2a4996 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1265,24 +1265,26 @@ static int estimate_best_b_count(MpegEncContext *s) for (i = 0; i < s->max_b_frames + 2; i++) { Picture pre_input, *pre_input_ptr = i ? s->input_picture[i - 1] : s->next_picture_ptr; + uint8_t *data[4]; if (pre_input_ptr && (!i || s->input_picture[i - 1])) { pre_input = *pre_input_ptr; + memcpy(data, pre_input_ptr->f->data, sizeof(data)); if (!pre_input.shared && i) { - pre_input.f->data[0] += INPLACE_OFFSET; - pre_input.f->data[1] += INPLACE_OFFSET; - pre_input.f->data[2] += INPLACE_OFFSET; + data[0] += INPLACE_OFFSET; + data[1] += INPLACE_OFFSET; + data[2] += INPLACE_OFFSET; } s->dsp.shrink[scale](s->tmp_frames[i]->data[0], s->tmp_frames[i]->linesize[0], - pre_input.f->data[0], pre_input.f->linesize[0], + data[0], pre_input.f->linesize[0], c->width, c->height); s->dsp.shrink[scale](s->tmp_frames[i]->data[1], s->tmp_frames[i]->linesize[1], - pre_input.f->data[1], pre_input.f->linesize[1], + data[1], pre_input.f->linesize[1], c->width >> 1, c->height >> 1); s->dsp.shrink[scale](s->tmp_frames[i]->data[2], s->tmp_frames[i]->linesize[2], - pre_input.f->data[2], pre_input.f->linesize[2], + data[2], pre_input.f->linesize[2], c->width >> 1, c->height >> 1); } } |