libavcodec/libaomenc.c fails to build (undeclared symbols/variables)

[slycordinator]

Summary of the bug: libavcodec/libaomenc.c fails to build; gives [error: ‘AV1E_SET_ENABLE_*_PARTITIONS’ undeclared here]
How to reproduce:

Download current git sources ffmpeg-snapshot.tar.bz2
Unpack
configure to build libaom
make

CC libavcodec/libfdk-aacenc.o
libavcodec/libaomenc.c:148:6: error: ‘AV1E_SET_ENABLE_1TO4_PARTITIONS’ undeclared here (not in a function); did you mean ‘AV1E_SET_ENABLE_RESTORATION’?

148 | [AV1E_SET_ENABLE_1TO4_PARTITIONS] = "AV1E_SET_ENABLE_1TO4_PARTITIONS",

|
^{| AV1E_SET_ENABLE_RESTORATION}

libavcodec/libaomenc.c:148:6: error: array index in initializer not of integer type
libavcodec/libaomenc.c:148:6: note: (near initialization for ‘ctlidstr’)
CC libavcodec/libmp3lame.o
libavcodec/libaomenc.c:149:6: error: ‘AV1E_SET_ENABLE_AB_PARTITIONS’ undeclared here (not in a function); did you mean ‘AV1E_SET_ENABLE_RESTORATION’?

149 | [AV1E_SET_ENABLE_AB_PARTITIONS] = "AV1E_SET_ENABLE_AB_PARTITIONS",

|
^{| AV1E_SET_ENABLE_RESTORATION}

libavcodec/libaomenc.c:149:6: error: array index in initializer not of integer type
libavcodec/libaomenc.c:149:6: note: (near initialization for ‘ctlidstr’)
libavcodec/libaomenc.c:150:6: error: ‘AV1E_SET_ENABLE_RECT_PARTITIONS’ undeclared here (not in a function); did you mean ‘AV1E_SET_ENABLE_RESTORATION’?

150 | [AV1E_SET_ENABLE_RECT_PARTITIONS] = "AV1E_SET_ENABLE_RECT_PARTITIONS",

|
^{| AV1E_SET_ENABLE_RESTORATION}

libavcodec/libaomenc.c:150:6: error: array index in initializer not of integer type
libavcodec/libaomenc.c:150:6: note: (near initialization for ‘ctlidstr’)
CC libavcodec/libopus.o
libavcodec/libaomenc.c:151:6: error: ‘AV1E_SET_ENABLE_ANGLE_DELTA’ undeclared here (not in a function); did you mean ‘AV1E_SET_ENABLE_SUPERRES’?

151 | [AV1E_SET_ENABLE_ANGLE_DELTA] = "AV1E_SET_ENABLE_ANGLE_DELTA",

|
^{| AV1E_SET_ENABLE_SUPERRES}

libavcodec/libaomenc.c:151:6: error: array index in initializer not of integer type
libavcodec/libaomenc.c:151:6: note: (near initialization for ‘ctlidstr’)
libavcodec/libaomenc.c:152:6: error: ‘AV1E_SET_ENABLE_CFL_INTRA’ undeclared here (not in a function); did you mean ‘AV1E_SET_ENABLE_JNT_COMP’?

152 | [AV1E_SET_ENABLE_CFL_INTRA] = "AV1E_SET_ENABLE_CFL_INTRA",

|
^{| AV1E_SET_ENABLE_JNT_COMP}

libavcodec/libaomenc.c:152:6: error: array index in initializer not of integer type
libavcodec/libaomenc.c:152:6: note: (near initialization for ‘ctlidstr’)
libavcodec/libaomenc.c:153:6: error: ‘AV1E_SET_ENABLE_FILTER_INTRA’ undeclared here (not in a function); did you mean ‘AV1E_SET_ENABLE_ORDER_HINT’?

153 | [AV1E_SET_ENABLE_FILTER_INTRA] = "AV1E_SET_ENABLE_FILTER_INTRA",

| ^{~
| AV1E_SET_ENABLE_ORDER_HINT}

libavcodec/libaomenc.c:153:6: error: array index in initializer not of integer type
libavcodec/libaomenc.c:153:6: note: (near initialization for ‘ctlidstr’)
libavcodec/libaomenc.c:154:6: error: ‘AV1E_SET_ENABLE_INTRA_EDGE_FILTER’ undeclared here (not in a function)

154 | [AV1E_SET_ENABLE_INTRA_EDGE_FILTER] = "AV1E_SET_ENABLE_INTRA_EDGE_FILTER",

|

libavcodec/libaomenc.c:154:6: error: array index in initializer not of integer type
libavcodec/libaomenc.c:154:6: note: (near initialization for ‘ctlidstr’)
libavcodec/libaomenc.c:155:6: error: ‘AV1E_SET_ENABLE_PAETH_INTRA’ undeclared here (not in a function); did you mean ‘AV1E_SET_ENABLE_ORDER_HINT’?

155 | [AV1E_SET_ENABLE_PAETH_INTRA] = "AV1E_SET_ENABLE_PAETH_INTRA",

|
^{| AV1E_SET_ENABLE_ORDER_HINT}

libavcodec/libaomenc.c:155:6: error: array index in initializer not of integer type
libavcodec/libaomenc.c:155:6: note: (near initialization for ‘ctlidstr’)
libavcodec/libaomenc.c:156:6: error: ‘AV1E_SET_ENABLE_SMOOTH_INTRA’ undeclared here (not in a function); did you mean ‘AV1E_SET_ENABLE_ORDER_HINT’?

156 | [AV1E_SET_ENABLE_SMOOTH_INTRA] = "AV1E_SET_ENABLE_SMOOTH_INTRA",

| ^{~
| AV1E_SET_ENABLE_ORDER_HINT}

libavcodec/libaomenc.c:156:6: error: array index in initializer not of integer type
libavcodec/libaomenc.c:156:6: note: (near initialization for ‘ctlidstr’)
libavcodec/libaomenc.c:157:6: error: ‘AV1E_SET_ENABLE_PALETTE’ undeclared here (not in a function); did you mean ‘AV1E_SET_ENABLE_SUPERRES’?

157 | [AV1E_SET_ENABLE_PALETTE] = "AV1E_SET_ENABLE_PALETTE",

|
^{| AV1E_SET_ENABLE_SUPERRES}

libavcodec/libaomenc.c:157:6: error: array index in initializer not of integer type
libavcodec/libaomenc.c:157:6: note: (near initialization for ‘ctlidstr’)
CC libavcodec/libopusdec.o
CC libavcodec/libopusenc.o
CC libavcodec/libvorbisdec.o
make: * [ffbuild/common.mak:59: libavcodec/libaomenc.o] Error 1
make: * Waiting for unfinished jobs....
make: Leaving directory '/tmp/tmp.ShpjTBD5DM/ffmpeg'

[Bruno Verachten]

I also had this behaviour yesterday, but after the git pull this morning, it disappeared.

[Carl Eugen Hoyos]

Regression since aa5c6f382be65d2dd964a04c9f11b4180624e332, fixed by James Zern in d294716c22c827d889dde235a8e9fcd4dd6466c9