Showing the changes to libavfilter (3 of 7 files). Show all
Unified · Split
| @@ -578,8 +578,6 @@ SKIPHEADERS-$(CONFIG_OPENCL) += opencl.h · 577 unmodified lines | ||
| 578 | 578 | SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_vpp.h |
| 579 | 579 | SKIPHEADERS-$(CONFIG_VULKAN) += vulkan.h |
| 580 | 580 | |
| 581 | −OBJS-$(CONFIG_LIBGLSLANG) += glslang.o | |
| 582 | − | |
| 583 | 581 | TOOLS = graph2dot |
| 584 | 582 | TESTPROGS = drawutils filtfmts formats integral |
| 585 | 583 | |
| @@ -1,19 +0,0 @@ | ||
| 1 | −/* | |
| 2 | − * This file is part of FFmpeg. | |
| 3 | − * | |
| 4 | − * FFmpeg is free software; you can redistribute it and/or | |
| 5 | − * modify it under the terms of the GNU Lesser General Public | |
| 6 | − * License as published by the Free Software Foundation; either | |
| 7 | − * version 2.1 of the License, or (at your option) any later version. | |
| 8 | − * | |
| 9 | − * FFmpeg is distributed in the hope that it will be useful, | |
| 10 | − * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 11 | − * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 12 | − * Lesser General Public License for more details. | |
| 13 | − * | |
| 14 | − * You should have received a copy of the GNU Lesser General Public | |
| 15 | − * License along with FFmpeg; if not, write to the Free Software | |
| 16 | − * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | |
| 17 | − */ | |
| 18 | − | |
| 19 | −#include "libavutil/vulkan_glslang.c" | |
| @@ -188,8 +188,5 @@ int ff_vk_filter_init(AVFilterContext *avctx) · 187 unmodified lines | ||
| 188 | 188 | |
| 189 | 189 | s->output_format = AV_PIX_FMT_NONE; |
| 190 | 190 | |
| 191 | − if (ff_vk_glslang_init()) | |
| 192 | − return AVERROR_EXTERNAL; | |
| 193 | − | |
| 194 | 191 | return 0; |
| 195 | 192 | } |