virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-24 17:12:34 +02:00
Code Issues Releases Activity

mpegvideo: reindent.

Browse Source
This commit is contained in:
Ronald S. Bultje 2011-05-03 08:23:41 -04:00
parent 7643265505
commit d969e93a72
1 changed files with 113 additions and 118 deletions

5
libavcodec/mpegvideo.c

@ -521,7 +521,6 @@ av_cold int MPV_common_init(MpegEncContext *s)
s->flags2= s->avctx->flags2; s->flags2= s->avctx->flags2;
if (s->width && s->height) { if (s->width && s->height) {
s->mb_width = (s->width + 15) / 16; s->mb_width = (s->width + 15) / 16;
s->mb_stride = s->mb_width + 1; s->mb_stride = s->mb_width + 1;
s->b8_stride = s->mb_width*2 + 1; s->b8_stride = s->mb_width*2 + 1;
@ -601,7 +600,6 @@ av_cold int MPV_common_init(MpegEncContext *s)
FF_ALLOCZ_OR_GOTO(s->avctx, s->dct_offset, 2 * 64 * sizeof(uint16_t), fail) FF_ALLOCZ_OR_GOTO(s->avctx, s->dct_offset, 2 * 64 * sizeof(uint16_t), fail)
} }
} }
} }
FF_ALLOCZ_OR_GOTO(s->avctx, s->picture, MAX_PICTURE_COUNT * sizeof(Picture), fail) FF_ALLOCZ_OR_GOTO(s->avctx, s->picture, MAX_PICTURE_COUNT * sizeof(Picture), fail)
@ -610,7 +608,6 @@ av_cold int MPV_common_init(MpegEncContext *s)
} }
if (s->width && s->height) { if (s->width && s->height) {
FF_ALLOCZ_OR_GOTO(s->avctx, s->error_status_table, mb_array_size*sizeof(uint8_t), fail) FF_ALLOCZ_OR_GOTO(s->avctx, s->error_status_table, mb_array_size*sizeof(uint8_t), fail)
if(s->codec_id==CODEC_ID_MPEG4 || (s->flags & CODEC_FLAG_INTERLACED_ME)){ if(s->codec_id==CODEC_ID_MPEG4 || (s->flags & CODEC_FLAG_INTERLACED_ME)){
@ -670,7 +667,6 @@ av_cold int MPV_common_init(MpegEncContext *s)
s->context_initialized = 1; s->context_initialized = 1;
if (s->width && s->height) { if (s->width && s->height) {
s->thread_context[0]= s; s->thread_context[0]= s;
threads = s->avctx->thread_count; threads = s->avctx->thread_count;
@ -685,7 +681,6 @@ av_cold int MPV_common_init(MpegEncContext *s)
s->thread_context[i]->start_mb_y= (s->mb_height*(i ) + s->avctx->thread_count/2) / s->avctx->thread_count; s->thread_context[i]->start_mb_y= (s->mb_height*(i ) + s->avctx->thread_count/2) / s->avctx->thread_count;
s->thread_context[i]->end_mb_y = (s->mb_height*(i+1) + s->avctx->thread_count/2) / s->avctx->thread_count; s->thread_context[i]->end_mb_y = (s->mb_height*(i+1) + s->avctx->thread_count/2) / s->avctx->thread_count;
} }
} }
return 0; return 0;