RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
wm4 2017-10-30 13:36:44 +01:00
parent 4f51326c28
commit d6ebb2df47
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
audio/audio.c
View File

@ -358,8 +358,8 @@ struct mp_audio *mp_audio_from_avframe(struct AVFrame *avframe)
#if LIBAVUTIL_VERSION_MICRO >= 100 #if LIBAVUTIL_VERSION_MICRO >= 100
// FFmpeg being stupid POS again // FFmpeg being stupid POS again
if (lavc_chmap.num != av_frame_get_channels(avframe)) if (lavc_chmap.num != avframe->channels)
mp_chmap_from_channels(&lavc_chmap, av_frame_get_channels(avframe)); mp_chmap_from_channels(&lavc_chmap, avframe->channels);
#endif #endif
new->rate = avframe->sample_rate; new->rate = avframe->sample_rate;
@ -473,7 +473,7 @@ int mp_audio_to_avframe(struct mp_audio *frame, struct AVFrame *avframe)
goto fail; goto fail;
#if LIBAVUTIL_VERSION_MICRO >= 100 #if LIBAVUTIL_VERSION_MICRO >= 100
// FFmpeg being a stupid POS again // FFmpeg being a stupid POS again
av_frame_set_channels(avframe, frame->channels.num); avframe->channels = frame->channels.num;
#endif #endif
avframe->sample_rate = frame->rate; avframe->sample_rate = frame->rate;

2
audio/filter/af_lavfi.c
View File

@ -265,7 +265,7 @@ static void get_metadata_from_av_frame(struct af_instance *af, AVFrame *frame)
if (!p->metadata) if (!p->metadata)
p->metadata = talloc_zero(p, struct mp_tags); p->metadata = talloc_zero(p, struct mp_tags);
mp_tags_copy_from_av_dictionary(p->metadata, av_frame_get_metadata(frame)); mp_tags_copy_from_av_dictionary(p->metadata, frame->metadata);
#endif #endif
} }

2
video/decode/vd_lavc.c
View File

@ -1292,7 +1292,7 @@ static bool decode_frame(struct dec_video *vd)
#if LIBAVCODEC_VERSION_MICRO >= 100 #if LIBAVCODEC_VERSION_MICRO >= 100
mpi->pkt_duration = mpi->pkt_duration =
mp_pts_from_av(av_frame_get_pkt_duration(ctx->pic), &ctx->codec_timebase); mp_pts_from_av(ctx->pic->pkt_duration, &ctx->codec_timebase);
#endif #endif
update_image_params(vd, ctx->pic, &mpi->params); update_image_params(vd, ctx->pic, &mpi->params);

2
video/filter/vf_lavfi.c
View File

@ -326,7 +326,7 @@ static void get_metadata_from_av_frame(struct vf_instance *vf, AVFrame *frame)
if (!p->metadata) if (!p->metadata)
p->metadata = talloc_zero(p, struct mp_tags); p->metadata = talloc_zero(p, struct mp_tags);
mp_tags_copy_from_av_dictionary(p->metadata, av_frame_get_metadata(frame)); mp_tags_copy_from_av_dictionary(p->metadata, frame->metadata);
#endif #endif
} }