diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2014-07-16 18:31:06 -0400 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-07-17 03:05:24 -0700 |
| commit | 2db953f84671997e936f91140ffb5143c1537844 (patch) | |
| tree | 0cd2a844dce2a379cf5c1d74941190b188bd9ff7 /libavcodec/h264_slice.c | |
| parent | a11ef610eec5241e226efbd1c5bb5eb45c88d2c2 (diff) | |
| download | ffmpeg-2db953f84671997e936f91140ffb5143c1537844.tar.gz | |
h264: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Diffstat (limited to 'libavcodec/h264_slice.c')
| -rw-r--r-- | libavcodec/h264_slice.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 8e0e187af2..1b9f56b488 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -226,9 +226,9 @@ static int init_table_pools(H264Context *h) av_buffer_allocz); h->mb_type_pool = av_buffer_pool_init((big_mb_num + h->mb_stride) * sizeof(uint32_t), av_buffer_allocz); - h->motion_val_pool = av_buffer_pool_init(2 * (b4_array_size + 4) * - sizeof(int16_t), av_buffer_allocz); - h->ref_index_pool = av_buffer_pool_init(4 * mb_array_size, av_buffer_allocz); + h->motion_val_pool = av_buffer_pool_init(2 * (b4_array_size + 4) * + sizeof(int16_t), av_buffer_allocz); + h->ref_index_pool = av_buffer_pool_init(4 * mb_array_size, av_buffer_allocz); if (!h->qscale_table_pool || !h->mb_type_pool || !h->motion_val_pool || !h->ref_index_pool) { @@ -1045,7 +1045,10 @@ static int init_dimensions(H264Context *h) return AVERROR_INVALIDDATA; av_log(h->avctx, AV_LOG_WARNING, "Ignoring cropping information.\n"); - h->sps.crop_bottom = h->sps.crop_top = h->sps.crop_right = h->sps.crop_left = 0; + h->sps.crop_bottom = + h->sps.crop_top = + h->sps.crop_right = + h->sps.crop_left = h->sps.crop = 0; width = h->width; @@ -2295,14 +2298,12 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg) if (get_bits_left(&h->gb) == 0) { er_add_slice(h, h->resync_mb_x, h->resync_mb_y, - h->mb_x - 1, h->mb_y, - ER_MB_END); + h->mb_x - 1, h->mb_y, ER_MB_END); return 0; } else { er_add_slice(h, h->resync_mb_x, h->resync_mb_y, - h->mb_x - 1, h->mb_y, - ER_MB_END); + h->mb_x - 1, h->mb_y, ER_MB_END); return AVERROR_INVALIDDATA; } @@ -2315,8 +2316,7 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg) if (get_bits_left(&h->gb) == 0) { er_add_slice(h, h->resync_mb_x, h->resync_mb_y, - h->mb_x - 1, h->mb_y, - ER_MB_END); + h->mb_x - 1, h->mb_y, ER_MB_END); if (h->mb_x > lf_x_start) loop_filter(h, lf_x_start, h->mb_x); |