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 /video/mp_image.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 'video/mp_image.c')
-rw-r--r-- | video/mp_image.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/video/mp_image.c b/video/mp_image.c index b56c9e60b3..ee1ab4104e 100644 --- a/video/mp_image.c +++ b/video/mp_image.c @@ -744,9 +744,7 @@ struct mp_image *mp_image_from_av_frame(struct AVFrame *av_frame) mp_image_copy_fields_from_av_frame(&t, av_frame); for (int p = 0; p < MP_MAX_PLANES; p++) t.bufs[p] = av_frame->buf[p]; -#if HAVE_AVUTIL_HAS_HWCONTEXT t.hwctx = av_frame->hw_frames_ctx; -#endif return mp_image_new_ref(&t); } @@ -763,9 +761,7 @@ struct AVFrame *mp_image_to_av_frame(struct mp_image *img) mp_image_copy_fields_to_av_frame(frame, new_ref); for (int p = 0; p < MP_MAX_PLANES; p++) frame->buf[p] = new_ref->bufs[p]; -#if HAVE_AVUTIL_HAS_HWCONTEXT frame->hw_frames_ctx = new_ref->hwctx; -#endif *new_ref = (struct mp_image){0}; talloc_free(new_ref); return frame; |