diff mbox series

[FFmpeg-devel,1/5] configure: Remove null_bsf dependency

Message ID AM7PR03MB666039DF03143050157A60F28FD29@AM7PR03MB6660.eurprd03.prod.outlook.com
State Accepted
Commit a1292895cb3f7cfe0c68b9201f7e22144984f6f4
Headers show
Series [FFmpeg-devel,1/5] configure: Remove null_bsf dependency | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished

Commit Message

Andreas Rheinhardt Sept. 6, 2021, 8:20 p.m. UTC 
Unneeded since c96904f525afcaba756a5ce8511a3ee1aa9fd2d7
(a bsf-list with zero bsfs is used since that commit).

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
I used the (always available) av_bsf_get_null_filter() as the fallback
in target_bsf_fuzzer.c; although I don't think it makes sense fuzzing
it.

 configure                 | 1 -
 tools/target_bsf_fuzzer.c | 6 ++----
 2 files changed, 2 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/configure b/configure
index af410a9d11..a2b834c760 100755
--- a/configure
+++ b/configure
@@ -3726,7 +3726,6 @@  cws2fws_extralibs="zlib_extralibs"
 # libraries, in any order
 avcodec_deps="avutil"
 avcodec_suggest="libm"
-avcodec_select="null_bsf"
 avdevice_deps="avformat avcodec avutil"
 avdevice_suggest="libm"
 avfilter_deps="avutil"
diff --git a/tools/target_bsf_fuzzer.c b/tools/target_bsf_fuzzer.c
index 56f011ad21..73bf4bdf0e 100644
--- a/tools/target_bsf_fuzzer.c
+++ b/tools/target_bsf_fuzzer.c
@@ -54,16 +54,14 @@  int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
 #define BSF_SYMBOL(BSF) BSF_SYMBOL0(BSF)
         extern AVBitStreamFilter BSF_SYMBOL(FFMPEG_BSF);
         f = &BSF_SYMBOL(FFMPEG_BSF);
-#else
-        extern AVBitStreamFilter ff_null_bsf;
-        f = &ff_null_bsf;
 #endif
         av_log_set_level(AV_LOG_PANIC);
     }
 
-    res = av_bsf_alloc(f, &bsf);
+    res = f ? av_bsf_alloc(f, &bsf) : av_bsf_get_null_filter(&bsf);
     if (res < 0)
         error("Failed memory allocation");
+    f = bsf->filter;
 
     if (size > 1024) {
         GetByteContext gbc;