diff options
| author | wm4 <wm4@nowhere> | 2016-12-07 19:44:29 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-12-07 19:53:11 +0100 |
| commit | 3eceac2eab0b42ee082a0b615ebf40a21f0fb915 (patch) | |
| tree | a7f719897b49f44006d44a1efcdab3b8d203aad8 /audio/decode/ad_spdif.c | |
| parent | a660e15c9b96bd46209e78b3c3d4cf136a039a50 (diff) | |
| download | mpv-3eceac2eab0b42ee082a0b615ebf40a21f0fb915.tar.bz2 mpv-3eceac2eab0b42ee082a0b615ebf40a21f0fb915.tar.xz | |
Remove compatibility things
Possible with bumped FFmpeg/Libav.
These are just the simple cases.
Diffstat (limited to 'audio/decode/ad_spdif.c')
| -rw-r--r-- | audio/decode/ad_spdif.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/audio/decode/ad_spdif.c b/audio/decode/ad_spdif.c index 56e4a8102d..e15aca5c53 100644 --- a/audio/decode/ad_spdif.c +++ b/audio/decode/ad_spdif.c @@ -116,16 +116,10 @@ static int determine_codec_profile(struct dec_audio *da, AVPacket *pkt) goto done; } -#if HAVE_AVCODEC_NEW_CODEC_API if (avcodec_send_packet(ctx, pkt) < 0) goto done; if (avcodec_receive_frame(ctx, frame) < 0) goto done; -#else - int got_frame = 0; - if (avcodec_decode_audio4(ctx, frame, &got_frame, pkt) < 1 || !got_frame) - goto done; -#endif profile = ctx->profile; @@ -178,11 +172,7 @@ static int init_filter(struct dec_audio *da, AVPacket *pkt) if (!stream) goto fail; -#if HAVE_AVCODEC_HAS_CODECPAR stream->codecpar->codec_id = spdif_ctx->codec_id; -#else - stream->codec->codec_id = spdif_ctx->codec_id; -#endif AVDictionary *format_opts = NULL; |