X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fbitstream_filters.c;h=e03326515b2673f75725360bd5f6c952e3b92b2c;hb=f4df5039a791a56de85c64e6b9e4448a221b5c40;hp=463003966adc955bda5665926821cd10eb04067d;hpb=80e9f50f82a7fc633954eca399e2203e5cda2a4d;p=ffmpeg

diff --git a/libavcodec/bitstream_filters.c b/libavcodec/bitstream_filters.c
index 463003966ad..e03326515b2 100644
--- a/libavcodec/bitstream_filters.c
+++ b/libavcodec/bitstream_filters.c
@@ -22,9 +22,10 @@
 #include "libavutil/log.h"
 
 #include "avcodec.h"
-#include "bsf.h"
+#include "bsf_internal.h"
 
 extern const AVBitStreamFilter ff_aac_adtstoasc_bsf;
+extern const AVBitStreamFilter ff_av1_frame_merge_bsf;
 extern const AVBitStreamFilter ff_av1_frame_split_bsf;
 extern const AVBitStreamFilter ff_av1_metadata_bsf;
 extern const AVBitStreamFilter ff_chomp_bsf;
@@ -48,8 +49,11 @@ extern const AVBitStreamFilter ff_mpeg4_unpack_bframes_bsf;
 extern const AVBitStreamFilter ff_mov2textsub_bsf;
 extern const AVBitStreamFilter ff_noise_bsf;
 extern const AVBitStreamFilter ff_null_bsf;
+extern const AVBitStreamFilter ff_opus_metadata_bsf;
+extern const AVBitStreamFilter ff_pcm_rechunk_bsf;
 extern const AVBitStreamFilter ff_prores_metadata_bsf;
 extern const AVBitStreamFilter ff_remove_extradata_bsf;
+extern const AVBitStreamFilter ff_setts_bsf;
 extern const AVBitStreamFilter ff_text2movsub_bsf;
 extern const AVBitStreamFilter ff_trace_headers_bsf;
 extern const AVBitStreamFilter ff_truehd_core_bsf;
@@ -71,12 +75,6 @@ const AVBitStreamFilter *av_bsf_iterate(void **opaque)
     return f;
 }
 
-#if FF_API_NEXT
-const AVBitStreamFilter *av_bsf_next(void **opaque) {
-    return av_bsf_iterate(opaque);
-}
-#endif
-
 const AVBitStreamFilter *av_bsf_get_by_name(const char *name)
 {
     const AVBitStreamFilter *f = NULL;
@@ -93,20 +91,12 @@ const AVBitStreamFilter *av_bsf_get_by_name(const char *name)
     return NULL;
 }
 
-const AVClass *ff_bsf_child_class_next(const AVClass *prev)
+const AVClass *ff_bsf_child_class_iterate(void **opaque)
 {
-    const AVBitStreamFilter *f = NULL;
-    void *i = 0;
-
-    /* find the filter that corresponds to prev */
-    while (prev && (f = av_bsf_iterate(&i))) {
-        if (f->priv_class == prev) {
-            break;
-        }
-    }
+    const AVBitStreamFilter *f;
 
     /* find next filter with priv options */
-    while ((f = av_bsf_iterate(&i))) {
+    while ((f = av_bsf_iterate(opaque))) {
         if (f->priv_class)
             return f->priv_class;
     }