[FFmpeg-cvslog] avcodec/libaomenc: fix build w/libaom v1.0.0

[James Zern]

ffmpeg | branch: master | James Zern <jzern at google.com> | Wed Jul  1 19:53:54 2020 -0700| [d294716c22c827d889dde235a8e9fcd4dd6466c9] | committer: James Zern

avcodec/libaomenc: fix build w/libaom v1.0.0

broken since:
aa5c6f382b avcodec/libaomenc: Add command-line options to control the use of partition tools

Reviewed-by: James Almer <jamrial at gmail.com>
Signed-off-by: James Zern <jzern at google.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d294716c22c827d889dde235a8e9fcd4dd6466c9
---

 doc/encoders.texi      | 20 ++++++++++----------
 libavcodec/libaomenc.c |  4 ++++
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/doc/encoders.texi b/doc/encoders.texi
index beaa72eeaf..5406d20c00 100644
--- a/doc/encoders.texi
+++ b/doc/encoders.texi
@@ -1599,34 +1599,34 @@ Enable the use of global motion for block prediction. Default is true.
 Enable block copy mode for intra block prediction. This mode is
 useful for screen content. Default is true.
 
- at item enable-rect-partitions (@emph{boolean})
+ at item enable-rect-partitions (@emph{boolean}) (Requires libaom >= v2.0.0)
 Enable rectangular partitions. Default is true.
 
- at item enable-1to4-partitions (@emph{boolean})
+ at item enable-1to4-partitions (@emph{boolean}) (Requires libaom >= v2.0.0)
 Enable 1:4/4:1 partitions. Default is true.
 
- at item enable-ab-partitions (@emph{boolean})
+ at item enable-ab-partitions (@emph{boolean}) (Requires libaom >= v2.0.0)
 Enable AB shape partitions. Default is true.
 
- at item enable-angle-delta (@emph{boolean})
+ at item enable-angle-delta (@emph{boolean}) (Requires libaom >= v2.0.0)
 Enable angle delta intra prediction. Default is true.
 
- at item enable-cfl-intra (@emph{boolean})
+ at item enable-cfl-intra (@emph{boolean}) (Requires libaom >= v2.0.0)
 Enable chroma predicted from luma intra prediction. Default is true.
 
- at item enable-filter-intra (@emph{boolean})
+ at item enable-filter-intra (@emph{boolean}) (Requires libaom >= v2.0.0)
 Enable filter intra predictor. Default is true.
 
- at item enable-intra-edge-filter (@emph{boolean})
+ at item enable-intra-edge-filter (@emph{boolean}) (Requires libaom >= v2.0.0)
 Enable intra edge filter. Default is true.
 
- at item enable-smooth-intra (@emph{boolean})
+ at item enable-smooth-intra (@emph{boolean}) (Requires libaom >= v2.0.0)
 Enable smooth intra prediction mode. Default is true.
 
- at item enable-paeth-intra (@emph{boolean})
+ at item enable-paeth-intra (@emph{boolean}) (Requires libaom >= v2.0.0)
 Enable paeth predictor in intra prediction. Default is true.
 
- at item enable-palette (@emph{boolean})
+ at item enable-palette (@emph{boolean}) (Requires libaom >= v2.0.0)
 Enable palette prediction mode. Default is true.
 
 @end table
diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c
index cb6558476c..2ecb3de3a7 100644
--- a/libavcodec/libaomenc.c
+++ b/libavcodec/libaomenc.c
@@ -145,6 +145,7 @@ static const char *const ctlidstr[] = {
 #endif
     [AV1E_SET_ENABLE_CDEF]      = "AV1E_SET_ENABLE_CDEF",
     [AOME_SET_TUNING]           = "AOME_SET_TUNING",
+#if AOM_ENCODER_ABI_VERSION >= 22
     [AV1E_SET_ENABLE_1TO4_PARTITIONS] = "AV1E_SET_ENABLE_1TO4_PARTITIONS",
     [AV1E_SET_ENABLE_AB_PARTITIONS]   = "AV1E_SET_ENABLE_AB_PARTITIONS",
     [AV1E_SET_ENABLE_RECT_PARTITIONS] = "AV1E_SET_ENABLE_RECT_PARTITIONS",
@@ -155,6 +156,7 @@ static const char *const ctlidstr[] = {
     [AV1E_SET_ENABLE_PAETH_INTRA]       = "AV1E_SET_ENABLE_PAETH_INTRA",
     [AV1E_SET_ENABLE_SMOOTH_INTRA]      = "AV1E_SET_ENABLE_SMOOTH_INTRA",
     [AV1E_SET_ENABLE_PALETTE]           = "AV1E_SET_ENABLE_PALETTE",
+#endif
 };
 
 static av_cold void log_encoder_error(AVCodecContext *avctx, const char *desc)
@@ -718,6 +720,7 @@ static av_cold int aom_init(AVCodecContext *avctx,
         codecctl_int(avctx, AV1E_SET_ENABLE_CDEF, ctx->enable_cdef);
     if (ctx->enable_restoration >= 0)
         codecctl_int(avctx, AV1E_SET_ENABLE_RESTORATION, ctx->enable_restoration);
+#if AOM_ENCODER_ABI_VERSION >= 22
     if (ctx->enable_rect_partitions >= 0)
         codecctl_int(avctx, AV1E_SET_ENABLE_RECT_PARTITIONS, ctx->enable_rect_partitions);
     if (ctx->enable_1to4_partitions >= 0)
@@ -738,6 +741,7 @@ static av_cold int aom_init(AVCodecContext *avctx,
         codecctl_int(avctx, AV1E_SET_ENABLE_SMOOTH_INTRA, ctx->enable_smooth_intra);
     if (ctx->enable_palette >= 0)
         codecctl_int(avctx, AV1E_SET_ENABLE_PALETTE, ctx->enable_palette);
+#endif
 
     codecctl_int(avctx, AOME_SET_STATIC_THRESHOLD, ctx->static_thresh);
     if (ctx->crf >= 0)