diff --git a/libswscale/framepool.c b/libswscale/framepool.c index 2d6bcb1..1dd0483 100644 --- a/libswscale/framepool.c +++ b/libswscale/framepool.c @@ -16,4 +16,5 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "framepool_names.h" #include "libavfilter/framepool.c" diff --git a/libswscale/framepool_names.h b/libswscale/framepool_names.h new file mode 100644 index 0000000..bae43dc --- /dev/null +++ b/libswscale/framepool_names.h @@ -0,0 +1,32 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/* + * libswscale's copy of libavfilter's frame pool under names of its own, so that + * the static libraries libswscale and libavfilter define no symbol twice. + */ + +#ifndef SWSCALE_FRAMEPOOL_NAMES_H +#define SWSCALE_FRAMEPOOL_NAMES_H + +#define ff_frame_pool_video_reinit sws_ff_frame_pool_video_reinit +#define ff_frame_pool_audio_reinit sws_ff_frame_pool_audio_reinit +#define ff_frame_pool_get sws_ff_frame_pool_get +#define ff_frame_pool_uninit sws_ff_frame_pool_uninit + +#endif /* SWSCALE_FRAMEPOOL_NAMES_H */ diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 9a822cb..de3a033 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -28,6 +28,7 @@ #include "swscale.h" #include "graph.h" +#include "framepool_names.h" #include "libavfilter/framepool.h" #include "libavutil/avassert.h" #include "libavutil/common.h"