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:16:31 +0100 |
| commit | 4fb1221e66dba5556cecf980b220792457cf7a83 (patch) | |
| tree | 42175102340f1494c77eb41c00fed708086ebfb5 /libavcodec/h264.c | |
| parent | 23c03ac91eaea5978f761ca7d16bc6c9bdcb3834 (diff) | |
| download | ffmpeg-4fb1221e66dba5556cecf980b220792457cf7a83.tar.gz | |
h264: reduce whitespace differences to libav
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 35b8c8c093..d0d32d3717 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2159,7 +2159,7 @@ static void decode_postinit(H264Context *h, int setup_finished) if (cur->reference == 0) cur->reference = DELAYED_PIC_REF; - out = h->delayed_pic[0]; + out = h->delayed_pic[0]; out_idx = 0; for (i = 1; h->delayed_pic[i] && !h->delayed_pic[i]->f.key_frame && @@ -2983,8 +2983,7 @@ static int field_end(H264Context *h, int in_setup) * past end by one (callers fault) and resync_mb_y != 0 * causes problems for the first MB line, too. */ - if (CONFIG_ERROR_RESILIENCE && - !FIELD_PICTURE(h) && h->current_slice && !h->sps.new) { + if (CONFIG_ERROR_RESILIENCE && !FIELD_PICTURE(h) && h->current_slice && !h->sps.new) { h->er.cur_pic = h->cur_pic_ptr; ff_er_frame_end(&h->er); } @@ -3302,8 +3301,8 @@ static int h264_slice_header_init(H264Context *h, int reinit) c->height = h->height; c->linesize = h->linesize; c->uvlinesize = h->uvlinesize; - c->chroma_x_shift = h->chroma_x_shift; - c->chroma_y_shift = h->chroma_y_shift; + c->chroma_x_shift = h->chroma_x_shift; + c->chroma_y_shift = h->chroma_y_shift; c->qscale = h->qscale; c->droppable = h->droppable; c->data_partitioning = h->data_partitioning; @@ -4758,7 +4757,9 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size, decode_rbsp_trailing(h, ptr + dst_length - 1)); if (h->avctx->debug & FF_DEBUG_STARTCODE) - av_log(h->avctx, AV_LOG_DEBUG, "NAL %d/%d at %d/%d length %d pass %d\n", hx->nal_unit_type, hx->nal_ref_idc, buf_index, buf_size, dst_length, pass); + av_log(h->avctx, AV_LOG_DEBUG, + "NAL %d/%d at %d/%d length %d pass %d\n", + hx->nal_unit_type, hx->nal_ref_idc, buf_index, buf_size, dst_length, pass); if (h->is_avc && (nalsize != consumed) && nalsize) av_log(h->avctx, AV_LOG_DEBUG, @@ -4860,7 +4861,7 @@ again: } h->cur_pic_ptr->f.key_frame |= - (hx->nal_unit_type == NAL_IDR_SLICE); + (hx->nal_unit_type == NAL_IDR_SLICE); if (hx->nal_unit_type == NAL_IDR_SLICE || h->recovery_frame == h->frame_num) { |