This is an automated email from the git hooks/post-receive script.
Git pushed a commit to branch master
in repository ffmpeg.
The following commit(s) were added to refs/heads/master by this push:
new f16ec8913e avcodec/h264_cavlc: Fix indentation
f16ec8913e is described below
commit f16ec8913e2e66efa7aff595a74f23e74d1476d3
Author: Andreas Rheinhardt <[email protected]>
AuthorDate: Sun May 10 17:15:51 2026 +0200
Commit: Andreas Rheinhardt <[email protected]>
CommitDate: Sun May 10 17:16:38 2026 +0200
avcodec/h264_cavlc: Fix indentation
Forgotten after 8d6947bc7d50732202f5a6c10633169c9d4e08bc.
Signed-off-by: Andreas Rheinhardt <[email protected]>
---
libavcodec/h264_cavlc.c | 100 ++++++++++++++++++++++++------------------------
1 file changed, 50 insertions(+), 50 deletions(-)
diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c
index 75e5fb7483..09f7b42ba0 100644
--- a/libavcodec/h264_cavlc.c
+++ b/libavcodec/h264_cavlc.c
@@ -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++){
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
