x/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-06-11 08:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/h264_cavlc: Fix indentation

Browse Source 
Forgotten after 8d6947bc7d.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2026-05-10 17:16:38 +02:00
parent 5bbc00c05d
commit f16ec8913e
1 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavcodec/h264_cavlc.c
+50 -50
View File
@@ -920,22 +920,22 @@ decode_intra_mb:
//FIXME we should set ref_idx_l? to 0 if we use that later ...
if(IS_16X16(mb_type)){
for (list = 0; list < sl->list_count; list++) {
unsigned int val;
if(IS_DIR(mb_type, 0, list)){
unsigned rc = sl->ref_count[list] << MB_MBAFF(sl);
if (rc == 1) {
val= 0;
} else if (rc == 2) {
val= get_bits1(&sl->gb)^1;
}else{
val= get_ue_golomb_31(&sl->gb);
if (val >= rc) {
av_log(h->avctx, AV_LOG_ERROR, "ref %u overflow\n", val);
return -1;
}
unsigned int val;
if (IS_DIR(mb_type, 0, list)) {
unsigned rc = sl->ref_count[list] << MB_MBAFF(sl);
if (rc == 1) {
val = 0;
} else if (rc == 2) {
val = get_bits1(&sl->gb)^1;
} else {
val = get_ue_golomb_31(&sl->gb);
if (val >= rc) {
av_log(h->avctx, AV_LOG_ERROR, "ref %u overflow\n", val);
return -1;
}
fill_rectangle(&sl->ref_cache[list][ scan8[0] ], 4, 4, 8, val, 1);
}
fill_rectangle(&sl->ref_cache[list][scan8[0]], 4, 4, 8, val, 1);
}
}
for (list = 0; list < sl->list_count; list++) {
if(IS_DIR(mb_type, 0, list)){
@@ -950,25 +950,25 @@ decode_intra_mb:
}
else if(IS_16X8(mb_type)){
for (list = 0; list < sl->list_count; list++) {
for(i=0; i<2; i++){
unsigned int val;
if(IS_DIR(mb_type, i, list)){
unsigned rc = sl->ref_count[list] << MB_MBAFF(sl);
if (rc == 1) {
val= 0;
} else if (rc == 2) {
val= get_bits1(&sl->gb)^1;
}else{
val= get_ue_golomb_31(&sl->gb);
if (val >= rc) {
av_log(h->avctx, AV_LOG_ERROR, "ref %u overflow\n", val);
return -1;
}
for (i = 0; i < 2; i++) {
unsigned int val;
if (IS_DIR(mb_type, i, list)) {
unsigned rc = sl->ref_count[list] << MB_MBAFF(sl);
if (rc == 1) {
val = 0;
} else if (rc == 2) {
val = get_bits1(&sl->gb)^1;
} else {
val = get_ue_golomb_31(&sl->gb);
if (val >= rc) {
av_log(h->avctx, AV_LOG_ERROR, "ref %u overflow\n", val);
return -1;
}
}else
val= LIST_NOT_USED&0xFF;
fill_rectangle(&sl->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, val, 1);
}
}
} else
val = LIST_NOT_USED & 0xFF;
fill_rectangle(&sl->ref_cache[list][scan8[0] + 16*i], 4, 2, 8, val, 1);
}
}
for (list = 0; list < sl->list_count; list++) {
for(i=0; i<2; i++){
@@ -988,25 +988,25 @@ decode_intra_mb:
}else{
av_assert2(IS_8X16(mb_type));
for (list = 0; list < sl->list_count; list++) {
for(i=0; i<2; i++){
unsigned int val;
if(IS_DIR(mb_type, i, list)){ //FIXME optimize
unsigned rc = sl->ref_count[list] << MB_MBAFF(sl);
if (rc == 1) {
val= 0;
} else if (rc == 2) {
val= get_bits1(&sl->gb)^1;
}else{
val= get_ue_golomb_31(&sl->gb);
if (val >= rc) {
av_log(h->avctx, AV_LOG_ERROR, "ref %u overflow\n", val);
return -1;
}
for (i = 0; i < 2; i++) {
unsigned int val;
if (IS_DIR(mb_type, i, list)) { //FIXME optimize
unsigned rc = sl->ref_count[list] << MB_MBAFF(sl);
if (rc == 1) {
val = 0;
} else if (rc == 2) {
val = get_bits1(&sl->gb)^1;
} else {
val = get_ue_golomb_31(&sl->gb);
if (val >= rc) {
av_log(h->avctx, AV_LOG_ERROR, "ref %u overflow\n", val);
return -1;
}
}else
val= LIST_NOT_USED&0xFF;
fill_rectangle(&sl->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, val, 1);
}
}
} else
val = LIST_NOT_USED & 0xFF;
fill_rectangle(&sl->ref_cache[list][scan8[0] + 2*i], 2, 4, 8, val, 1);
}
}
for (list = 0; list < sl->list_count; list++) {
for(i=0; i<2; i++){