all repos — mgba @ a7a51a11373f74f2e42f2c46441a34c993113dcc

mGBA Game Boy Advance Emulator

FFmpeg: Fix build with newer lavc (fixes #966)
Vicki Pfau vi@endrift.com
Wed, 17 Jan 2018 22:53:26 -0800
commit

a7a51a11373f74f2e42f2c46441a34c993113dcc

parent

7f23c857adbc00184ee3888c218532d8e1654dfe

1 files changed, 8 insertions(+), 0 deletions(-)

jump to
M src/feature/ffmpeg/ffmpeg-encoder.csrc/feature/ffmpeg/ffmpeg-encoder.c

@@ -229,7 +229,11 @@ encoder->audio->sample_fmt = encoder->sampleFormat;

AVDictionary* opts = 0; av_dict_set(&opts, "strict", "-2", 0); if (encoder->context->oformat->flags & AVFMT_GLOBALHEADER) { +#ifdef AV_CODEC_FLAG_GLOBAL_HEADER + encoder->audio->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; +#else encoder->audio->flags |= CODEC_FLAG_GLOBAL_HEADER; +#endif } avcodec_open2(encoder->audio, acodec, &opts); av_dict_free(&opts);

@@ -291,7 +295,11 @@ encoder->video->pix_fmt = encoder->pixFormat;

encoder->video->gop_size = 60; encoder->video->max_b_frames = 3; if (encoder->context->oformat->flags & AVFMT_GLOBALHEADER) { +#ifdef AV_CODEC_FLAG_GLOBAL_HEADER + encoder->video->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; +#else encoder->video->flags |= CODEC_FLAG_GLOBAL_HEADER; +#endif } if (strcmp(vcodec->name, "libx264") == 0) { // Try to adaptively figure out when you can use a slower encoder