---
Here are the formatting changes.
Vittorio
libavcodec/h264.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 75fad3d..27d2b53 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1762,7 +1762,7 @@ static int h264_frame_start(H264Context *h)
}
pic = &h->DPB[i];
- pic->reference = h->droppable ? 0 : h->picture_structure;
+ pic->reference = h->droppable ? 0 : h->picture_structure;
pic->f.coded_picture_number = h->coded_picture_number++;
pic->field_picture = h->picture_structure != PICT_FRAME;
/*
@@ -2266,8 +2266,8 @@ static av_always_inline void
hl_decode_mb_predict_luma(H264Context *h,
if (IS_INTRA4x4(mb_type)) {
if (IS_8x8DCT(mb_type)) {
if (transform_bypass) {
- idct_dc_add =
- idct_add = h->h264dsp.h264_add_pixels8_clear;
+ idct_dc_add =
+ idct_add = h->h264dsp.h264_add_pixels8_clear;
} else {
idct_dc_add = h->h264dsp.h264_idct8_dc_add;
idct_add = h->h264dsp.h264_idct8_add;
@@ -3434,7 +3434,7 @@ static int decode_slice_header(H264Context *h,
H264Context *h0)
ff_thread_report_progress(&h->cur_pic_ptr->tf, INT_MAX, 0);
ff_thread_report_progress(&h->cur_pic_ptr->tf, INT_MAX, 1);
ret = ff_generate_sliding_window_mmcos(h, 1);
- if (ret < 0 && h->avctx->err_recognition & AV_EF_EXPLODE)
+ if (ret < 0 && (h->avctx->err_recognition & AV_EF_EXPLODE))
return ret;
ret = ff_h264_execute_ref_pic_marking(h, h->mmco, h->mmco_index);
if (ret < 0 && (h->avctx->err_recognition & AV_EF_EXPLODE))
@@ -4341,7 +4341,7 @@ static int execute_decode_slices(H264Context *h, int
context_count)
return decode_slice(avctx, &h);
} else {
for (i = 1; i < context_count; i++) {
- hx = h->thread_context[i];
+ hx = h->thread_context[i];
hx->er.error_count = 0;
}
@@ -4790,7 +4790,7 @@ av_cold void ff_h264_free_context(H264Context *h)
static av_cold int h264_decode_end(AVCodecContext *avctx)
{
- H264Context *h = avctx->priv_data;
+ H264Context *h = avctx->priv_data;
ff_h264_free_context(h);
--
1.7.9.5
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
