diff options
| author | Helmut K. C. Tessarek <tessarek@evermeet.cx> | 2018-12-19 18:13:26 +0100 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2018-12-19 15:31:28 -0300 |
| commit | aaf9171574791cfa6bc5dd2115a840968d7ca5dc (patch) | |
| tree | 9ddc6aa39ded5e5727fbde71207b9437a0080c74 /libavcodec/libaomenc.c | |
| parent | a07470ba372fd85da5cf466365af6a98e18ac046 (diff) | |
| download | ffmpeg-aaf9171574791cfa6bc5dd2115a840968d7ca5dc.tar.gz | |
libavcodec/libaomenc: fix breakage from upstream
commit https://aomedia.googlesource.com/aom/+/4667aa1a373566e9c124afcd58c71731ab0d7377
changed parts of the code that broke compilation of libavcodec/libaomenc.c
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/libaomenc.c')
| -rw-r--r-- | libavcodec/libaomenc.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index 09ef423ce1..faec61cacd 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -195,7 +195,12 @@ static av_cold void free_frame_list(struct FrameListData *list) } static av_cold int codecctl_int(AVCodecContext *avctx, - enum aome_enc_control_id id, int val) +#ifdef UENUM1BYTE + aome_enc_control_id id, +#else + enum aome_enc_control_id id, +#endif + int val) { AOMContext *ctx = avctx->priv_data; char buf[80]; @@ -291,7 +296,7 @@ static int set_pix_fmt(AVCodecContext *avctx, aom_codec_caps_t codec_caps, static void set_color_range(AVCodecContext *avctx) { - enum aom_color_range aom_cr; + aom_color_range_t aom_cr; switch (avctx->color_range) { case AVCOL_RANGE_UNSPECIFIED: case AVCOL_RANGE_MPEG: aom_cr = AOM_CR_STUDIO_RANGE; break; |