Merge commit '9d76dd952ffd9fffc7f9fb5cc5af6d093ba54521'
* commit '9d76dd952ffd9fffc7f9fb5cc5af6d093ba54521': h264: drop commented out cruft Conflicts: libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
37ce3188de
@ -779,9 +779,6 @@ static int h264_frame_start(H264Context *h)
|
|||||||
h->block_offset[48 + 32 + i] = (4 * ((scan8[i] - scan8[0]) & 7) << pixel_shift) + 8 * h->uvlinesize * ((scan8[i] - scan8[0]) >> 3);
|
h->block_offset[48 + 32 + i] = (4 * ((scan8[i] - scan8[0]) & 7) << pixel_shift) + 8 * h->uvlinesize * ((scan8[i] - scan8[0]) >> 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
// s->decode = (h->flags & CODEC_FLAG_PSNR) || !s->encoding ||
|
|
||||||
// h->cur_pic.reference /* || h->contains_intra */ || 1;
|
|
||||||
|
|
||||||
/* We mark the current picture as non-reference after allocating it, so
|
/* We mark the current picture as non-reference after allocating it, so
|
||||||
* that if we break out due to an error it can be released automatically
|
* that if we break out due to an error it can be released automatically
|
||||||
* in the next ff_MPV_frame_start().
|
* in the next ff_MPV_frame_start().
|
||||||
|
Loading…
x
Reference in New Issue
Block a user