summaryrefslogtreecommitdiffstats
path: root/audio/audio.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-10-30 13:36:44 +0100
committerwm4 <wm4@nowhere>2017-10-30 13:36:44 +0100
commitd6ebb2df47fa2827aecdcf236a234cd2fe74fe2c (patch)
treee4a37397aab422549250e021ff0dd9f70beae089 /audio/audio.c
parent4f51326c28075b7b57ec21c201f71757fe77a000 (diff)
downloadmpv-d6ebb2df47fa2827aecdcf236a234cd2fe74fe2c.tar.bz2
mpv-d6ebb2df47fa2827aecdcf236a234cd2fe74fe2c.tar.xz
Get rid of deprecated AVFrame accessors
Fist we were required to use them for ABI compat. reasons (and other BS), now they're deprecated and we're supposed to access them directly again.
Diffstat (limited to 'audio/audio.c')
-rw-r--r--audio/audio.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/audio/audio.c b/audio/audio.c
index b636c66620..55e4266f45 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -358,8 +358,8 @@ struct mp_audio *mp_audio_from_avframe(struct AVFrame *avframe)
#if LIBAVUTIL_VERSION_MICRO >= 100
// FFmpeg being stupid POS again
- if (lavc_chmap.num != av_frame_get_channels(avframe))
- mp_chmap_from_channels(&lavc_chmap, av_frame_get_channels(avframe));
+ if (lavc_chmap.num != avframe->channels)
+ mp_chmap_from_channels(&lavc_chmap, avframe->channels);
#endif
new->rate = avframe->sample_rate;
@@ -473,7 +473,7 @@ int mp_audio_to_avframe(struct mp_audio *frame, struct AVFrame *avframe)
goto fail;
#if LIBAVUTIL_VERSION_MICRO >= 100
// FFmpeg being a stupid POS again
- av_frame_set_channels(avframe, frame->channels.num);
+ avframe->channels = frame->channels.num;
#endif
avframe->sample_rate = frame->rate;