mirror of https://git.ffmpeg.org/ffmpeg.git
Merge remote-tracking branch 'qatar/master'
* qatar/master: mpegvideo_enc: fix indentation in load_input_picture() Conflicts: libavcodec/mpegvideo_enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
5cb0782b95
|
@ -1093,7 +1093,9 @@ static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg)
|
|||
// empty
|
||||
} else {
|
||||
int h_chroma_shift, v_chroma_shift;
|
||||
avcodec_get_chroma_sub_sample(s->avctx->pix_fmt, &h_chroma_shift, &v_chroma_shift);
|
||||
av_pix_fmt_get_chroma_sub_sample(s->avctx->pix_fmt,
|
||||
&h_chroma_shift,
|
||||
&v_chroma_shift);
|
||||
|
||||
for (i = 0; i < 3; i++) {
|
||||
int src_stride = pic_arg->linesize[i];
|
||||
|
@ -1105,8 +1107,8 @@ static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg)
|
|||
uint8_t *src = pic_arg->data[i];
|
||||
uint8_t *dst = pic->data[i];
|
||||
|
||||
if(s->codec_id == AV_CODEC_ID_AMV && !(s->avctx->flags & CODEC_FLAG_EMU_EDGE)){
|
||||
h= ((s->height+15)/16*16)>>v_shift;
|
||||
if (s->codec_id == AV_CODEC_ID_AMV && !(s->avctx->flags & CODEC_FLAG_EMU_EDGE)) {
|
||||
h = ((s->height + 15)/16*16) >> v_shift;
|
||||
}
|
||||
|
||||
if (!s->avctx->rc_buffer_size)
|
||||
|
|
Loading…
Reference in New Issue