highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '3d71b1f8f09fccea7158e868fb9bd81b81205449'

Browse Source 
* commit '3d71b1f8f09fccea7158e868fb9bd81b81205449':
  mpegvideo_enc: Simplify picture allocation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-04-20 11:29:17 +02:00
commit fc83ff80b4
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/mpegvideo_enc.c
View File

@ -1143,14 +1143,12 @@ static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg)
if (direct) { if (direct) {
if ((ret = av_frame_ref(pic->f, pic_arg)) < 0) if ((ret = av_frame_ref(pic->f, pic_arg)) < 0)
return ret; return ret;
if (ff_alloc_picture(s, pic, 1) < 0) {
return -1;
}
} else {
if (ff_alloc_picture(s, pic, 0) < 0) {
return -1;
} }
ret = ff_alloc_picture(s, pic, direct);
if (ret < 0)
return ret;
if (!direct) {
if (pic->f->data[0] + INPLACE_OFFSET == pic_arg->data[0] && if (pic->f->data[0] + INPLACE_OFFSET == pic_arg->data[0] &&
pic->f->data[1] + INPLACE_OFFSET == pic_arg->data[1] && pic->f->data[1] + INPLACE_OFFSET == pic_arg->data[1] &&
pic->f->data[2] + INPLACE_OFFSET == pic_arg->data[2]) { pic->f->data[2] + INPLACE_OFFSET == pic_arg->data[2]) {