diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-03 01:07:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-03 01:24:01 +0100 |
| commit | 6e87dfb58945cd4e57fbe26abe59bbb1f8f7f143 (patch) | |
| tree | d8a07c502b7b404a8f21020749ee241809e944d1 | |
| parent | 4fb1221e66dba5556cecf980b220792457cf7a83 (diff) | |
mpegvideo: reduce whitespace differences to libav
This excludes many changes that worsen readability
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mpegvideo.c | 9 | ||||
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 2a5929d490..6f3e38d3e3 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1033,8 +1033,9 @@ av_cold int ff_MPV_common_init(MpegEncContext *s) &s->chroma_y_shift); /* convert fourcc to upper case */ - s->codec_tag = avpriv_toupper4(s->avctx->codec_tag); - s->stream_codec_tag = avpriv_toupper4(s->avctx->stream_codec_tag); + s->codec_tag = avpriv_toupper4(s->avctx->codec_tag); + + s->stream_codec_tag = avpriv_toupper4(s->avctx->stream_codec_tag); s->avctx->coded_frame = &s->current_picture.f; @@ -2767,7 +2768,7 @@ void MPV_decode_mb_internal(MpegEncContext *s, int16_t block[12][64], MPV_motion_lowres(s, dest_y, dest_cb, dest_cr, 1, s->next_picture.f.data, op_pix); } }else{ - op_qpix= s->me.qpel_put; + op_qpix = s->me.qpel_put; if ((!s->no_rounding) || s->pict_type==AV_PICTURE_TYPE_B){ op_pix = s->hdsp.put_pixels_tab; }else{ @@ -2878,7 +2879,7 @@ void MPV_decode_mb_internal(MpegEncContext *s, int16_t block[12][64], }else{ dct_linesize = uvlinesize << s->interlaced_dct; - dct_offset = s->interlaced_dct? uvlinesize : uvlinesize*block_size; + dct_offset = s->interlaced_dct ? uvlinesize : uvlinesize*block_size; s->dsp.idct_put(dest_cb, dct_linesize, block[4]); s->dsp.idct_put(dest_cr, dct_linesize, block[5]); diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 3f12e71269..6f50687064 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1820,7 +1820,7 @@ static av_always_inline void encode_mb_internal(MpegEncContext *s, ptr_cr = s->new_picture.f.data[2] + (mb_y * mb_block_height * wrap_c) + mb_x * mb_block_width; - if((mb_x*16+16 > s->width || mb_y*16+16 > s->height) && s->codec_id != AV_CODEC_ID_AMV){ + if((mb_x * 16 + 16 > s->width || mb_y * 16 + 16 > s->height) && s->codec_id != AV_CODEC_ID_AMV){ uint8_t *ebuf = s->edge_emu_buffer + 32; int cw = (s->width + s->chroma_x_shift) >> s->chroma_x_shift; int ch = (s->height + s->chroma_y_shift) >> s->chroma_y_shift; @@ -2572,6 +2572,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ if(is_gob_start){ if(s->start_mb_y != mb_y || mb_x!=0){ write_slice_end(s); + if(CONFIG_MPEG4_ENCODER && s->codec_id==AV_CODEC_ID_MPEG4 && s->partitioned_frame){ ff_mpeg4_init_partitions(s); } |