generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* 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:
Michael Niedermayer
2013-01-26 15:53:58 +01:00
parent c46943ec19 04f4dbc2fa
commit 5cb0782b95
1 changed files with 69 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/mpegvideo_enc.c
View File

@@ -1093,7 +1093,9 @@ static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg)
// empty // empty
} else { } else {
int h_chroma_shift, v_chroma_shift; 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++) { for (i = 0; i < 3; i++) {
int src_stride = pic_arg->linesize[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 *src = pic_arg->data[i];
uint8_t *dst = pic->data[i]; uint8_t *dst = pic->data[i];
if(s->codec_id == AV_CODEC_ID_AMV && !(s->avctx->flags & CODEC_FLAG_EMU_EDGE)){ if (s->codec_id == AV_CODEC_ID_AMV && !(s->avctx->flags & CODEC_FLAG_EMU_EDGE)) {
h= ((s->height+15)/16*16)>>v_shift; h = ((s->height + 15)/16*16) >> v_shift;
} }
if (!s->avctx->rc_buffer_size) if (!s->avctx->rc_buffer_size)