Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavc/libaomdec: fix build with 1.0.0

Browse Source 
aom_codec_frame_flags_t in libaom 1.0.0 is defined in aom_encoder.h,
whereas for newer versions it was moved to aom_codec.h
pull/362/head
Anton Khirnov 4 years ago
parent 0c7aef84a0
commit d43b26b30d
1 changed files with 12 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      libavcodec/libaomdec.c

4
libavcodec/libaomdec.c
Unescape View File

@ -161,7 +161,6 @@ static int aom_decode(AVCodecContext *avctx, void *data, int *got_frame,
AVFrame *picture = data; AVFrame *picture = data;
const void *iter = NULL; const void *iter = NULL;
struct aom_image *img; struct aom_image *img;
aom_codec_frame_flags_t av_unused flags;
int ret; int ret;
if (aom_codec_decode(&ctx->decoder, avpkt->data, avpkt->size, NULL) != if (aom_codec_decode(&ctx->decoder, avpkt->data, avpkt->size, NULL) !=
@ -200,6 +199,8 @@ static int aom_decode(AVCodecContext *avctx, void *data, int *got_frame,
return ret; return ret;
#ifdef AOM_CTRL_AOMD_GET_FRAME_FLAGS #ifdef AOM_CTRL_AOMD_GET_FRAME_FLAGS
{
aom_codec_frame_flags_t flags;
ret = aom_codec_control(&ctx->decoder, AOMD_GET_FRAME_FLAGS, &flags); ret = aom_codec_control(&ctx->decoder, AOMD_GET_FRAME_FLAGS, &flags);
if (ret == AOM_CODEC_OK) { if (ret == AOM_CODEC_OK) {
picture->key_frame = !!(flags & AOM_FRAME_IS_KEY); picture->key_frame = !!(flags & AOM_FRAME_IS_KEY);
@ -210,6 +211,7 @@ static int aom_decode(AVCodecContext *avctx, void *data, int *got_frame,
else else
picture->pict_type = AV_PICTURE_TYPE_P; picture->pict_type = AV_PICTURE_TYPE_P;
} }
}
#endif #endif
av_reduce(&picture->sample_aspect_ratio.num, av_reduce(&picture->sample_aspect_ratio.num,

Write Preview
Loading…
Cancel
Save