diff options
| author | Mark Thompson <sw@jkqxz.net> | 2017-07-22 21:51:41 +0100 |
|---|---|---|
| committer | Mark Thompson <sw@jkqxz.net> | 2017-07-22 21:51:41 +0100 |
| commit | f2c11b9337c90b98c315d8e24de43fffb48fed60 (patch) | |
| tree | d9cf3031fc40d5e9aea1de3e2db5136f18ff1e1e /libavutil/pixdesc.c | |
| parent | f48efb14f9f9000ae8b62fd8e1ddb55d2b8cb1ea (diff) | |
| download | ffmpeg-f2c11b9337c90b98c315d8e24de43fffb48fed60.tar.gz | |
pixdesc: Reindent after previous commit
Diffstat (limited to 'libavutil/pixdesc.c')
| -rw-r--r-- | libavutil/pixdesc.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index e606b8e5c8..cea5b0ffd9 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -2638,22 +2638,22 @@ enum AVPixelFormat av_find_best_pix_fmt_of_2(enum AVPixelFormat dst_pix_fmt1, en } else if (!desc2) { dst_pix_fmt = dst_pix_fmt1; } else { - loss_mask= loss_ptr?~*loss_ptr:~0; /* use loss mask if provided */ - if(!has_alpha) - loss_mask &= ~FF_LOSS_ALPHA; + loss_mask= loss_ptr?~*loss_ptr:~0; /* use loss mask if provided */ + if(!has_alpha) + loss_mask &= ~FF_LOSS_ALPHA; - score1 = get_pix_fmt_score(dst_pix_fmt1, src_pix_fmt, &loss1, loss_mask); - score2 = get_pix_fmt_score(dst_pix_fmt2, src_pix_fmt, &loss2, loss_mask); + score1 = get_pix_fmt_score(dst_pix_fmt1, src_pix_fmt, &loss1, loss_mask); + score2 = get_pix_fmt_score(dst_pix_fmt2, src_pix_fmt, &loss2, loss_mask); - if (score1 == score2) { - if(av_get_padded_bits_per_pixel(desc2) != av_get_padded_bits_per_pixel(desc1)) { - dst_pix_fmt = av_get_padded_bits_per_pixel(desc2) < av_get_padded_bits_per_pixel(desc1) ? dst_pix_fmt2 : dst_pix_fmt1; + if (score1 == score2) { + if(av_get_padded_bits_per_pixel(desc2) != av_get_padded_bits_per_pixel(desc1)) { + dst_pix_fmt = av_get_padded_bits_per_pixel(desc2) < av_get_padded_bits_per_pixel(desc1) ? dst_pix_fmt2 : dst_pix_fmt1; + } else { + dst_pix_fmt = desc2->nb_components < desc1->nb_components ? dst_pix_fmt2 : dst_pix_fmt1; + } } else { - dst_pix_fmt = desc2->nb_components < desc1->nb_components ? dst_pix_fmt2 : dst_pix_fmt1; + dst_pix_fmt = score1 < score2 ? dst_pix_fmt2 : dst_pix_fmt1; } - } else { - dst_pix_fmt = score1 < score2 ? dst_pix_fmt2 : dst_pix_fmt1; - } } if (loss_ptr) |