avcodec/aac/aacdec: Fix -Wdeclaration-after-statement

mkver · mkver · commit 0bc1d2fac4d6 · 2025-01-12T15:41:39.000+01:00
Signed-off-by: Andreas Rheinhardt &lt;andreas.rheinhardt@outlook.com&gt;
diff --git a/libavcodec/aac/aacdec.c b/libavcodec/aac/aacdec.c
@@ -1104,13 +1104,13 @@ static av_cold int decode_close(AVCodecContext *avctx)
 
     for (int i = 0; i < 2; i++) {
         OutputConfiguration *oc = &ac->oc[i];
-        av_channel_layout_uninit(&ac->oc[i].ch_layout);
-
         AACUSACConfig *usac = &oc->usac;
         for (int j = 0; j < usac->nb_elems; j++) {
             AACUsacElemConfig *ec = &usac->elems[j];
             av_freep(&ec->ext.pl_data);
         }
+
+        av_channel_layout_uninit(&ac->oc[i].ch_layout);
     }
 
     for (int type = 0; type < FF_ARRAY_ELEMS(ac->che); type++) {

Original file line number	Diff line number	Diff line change
`@@ -1104,13 +1104,13 @@ static av_cold int decode_close(AVCodecContext *avctx)`
`1104`	`1104`
`1105`	`1105`	`for (int i = 0; i < 2; i++) {`
`1106`	`1106`	`OutputConfiguration *oc = &ac->oc[i];`
`1107`		`- av_channel_layout_uninit(&ac->oc[i].ch_layout);`
`1108`		`-`
`1109`	`1107`	`AACUSACConfig *usac = &oc->usac;`
`1110`	`1108`	`for (int j = 0; j < usac->nb_elems; j++) {`
`1111`	`1109`	`AACUsacElemConfig *ec = &usac->elems[j];`
`1112`	`1110`	`av_freep(&ec->ext.pl_data);`
`1113`	`1111`	`}`
	`1112`	`+`
	`1113`	`+ av_channel_layout_uninit(&ac->oc[i].ch_layout);`
`1114`	`1114`	`}`
`1115`	`1115`
`1116`	`1116`	`for (int type = 0; type < FF_ARRAY_ELEMS(ac->che); type++) {`