virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

libavcodec/libaomenc: fix breakage from upstream

Browse Source 
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>
This commit is contained in:
Helmut K. C. Tessarek 2018-12-19 18:13:26 +01:00 committed by James Almer
parent a07470ba37
commit aaf9171574
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/libaomenc.c
View File

@ -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;