diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-03 09:52:39 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-03 09:52:39 +0200 |
| commit | 5fa5e73e81f191be0c4761bb4c517fdd39aff82e (patch) | |
| tree | 139e9170b7999ffe132e33a2a3b782d2d99c07f4 /libavfilter/vf_swapuv.c | |
| parent | 59b55619b6edef363532825c4cf16ac2bfdd21a1 (diff) | |
| parent | 1aa24df74c052a73175c43e57d35b4835e537ec8 (diff) | |
| download | ffmpeg-5fa5e73e81f191be0c4761bb4c517fdd39aff82e.tar.gz | |
Merge commit '1aa24df74c052a73175c43e57d35b4835e537ec8'
* commit '1aa24df74c052a73175c43e57d35b4835e537ec8':
lavu: Deprecate AVFrame.error[]
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavfilter/vf_swapuv.c')
| -rw-r--r-- | libavfilter/vf_swapuv.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libavfilter/vf_swapuv.c b/libavfilter/vf_swapuv.c index b450e6fb4c..624e6b624f 100644 --- a/libavfilter/vf_swapuv.c +++ b/libavfilter/vf_swapuv.c @@ -24,6 +24,7 @@ */ #include "libavutil/pixdesc.h" +#include "libavutil/version.h" #include "avfilter.h" #include "formats.h" #include "internal.h" @@ -33,8 +34,13 @@ static void do_swap(AVFrame *frame) { FFSWAP(uint8_t*, frame->data[1], frame->data[2]); FFSWAP(int, frame->linesize[1], frame->linesize[2]); - FFSWAP(uint64_t, frame->error[1], frame->error[2]); FFSWAP(AVBufferRef*, frame->buf[1], frame->buf[2]); + +#if FF_API_ERROR_FRAME +FF_DISABLE_DEPRECATION_WARNINGS + FFSWAP(uint64_t, frame->error[1], frame->error[2]); +FF_ENABLE_DEPRECATION_WARNINGS +#endif } static AVFrame *get_video_buffer(AVFilterLink *link, int w, int h) |