diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-17 14:00:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-17 14:00:01 +0200 |
| commit | 5fce29ef29e416d843a139e083ae9d3f7783132a (patch) | |
| tree | bbcb461ca841e57c4fd3387de9cf21e946e13ece /libavcodec/h264_slice.c | |
| parent | b884599f6a1c05ed8a0cbab72ac898d21456a58b (diff) | |
| parent | 2db953f84671997e936f91140ffb5143c1537844 (diff) | |
Merge commit '2db953f84671997e936f91140ffb5143c1537844'
* commit '2db953f84671997e936f91140ffb5143c1537844':
h264: K&R formatting cosmetics
Conflicts:
libavcodec/h264.c
libavcodec/h264_direct.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 ded26f8465..ac4da9de12 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -230,9 +230,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) { @@ -1128,7 +1128,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; @@ -2491,14 +2494,12 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg) if ( get_bits_left(&h->gb) == 0 || get_bits_left(&h->gb) > 0 && !(h->avctx->err_recognition & AV_EF_AGGRESSIVE)) { 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, h->mb_y, - ER_MB_END); + h->mb_x, h->mb_y, ER_MB_END); return AVERROR_INVALIDDATA; } @@ -2511,8 +2512,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); |