|
@@ -92,11 +92,6 @@ int ffmpeg_decode_init(struct ffmpeg_decode *decode, enum AVCodecID id,
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-#if LIBAVCODEC_VERSION_MAJOR < 60
|
|
|
- if (decode->codec->capabilities & CODEC_CAP_TRUNC)
|
|
|
- decode->decoder->flags |= CODEC_FLAG_TRUNC;
|
|
|
-#endif
|
|
|
-
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
@@ -265,13 +260,8 @@ bool ffmpeg_decode_audio(struct ffmpeg_decode *decode, uint8_t *data,
|
|
|
|
|
|
audio->samples_per_sec = decode->frame->sample_rate;
|
|
|
audio->format = convert_sample_format(decode->frame->format);
|
|
|
-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59, 24, 100)
|
|
|
- audio->speakers =
|
|
|
- convert_speaker_layout((uint8_t)decode->decoder->channels);
|
|
|
-#else
|
|
|
audio->speakers = convert_speaker_layout(
|
|
|
(uint8_t)decode->decoder->ch_layout.nb_channels);
|
|
|
-#endif
|
|
|
|
|
|
audio->frames = decode->frame->nb_samples;
|
|
|
|