#include "libavutil/avstring.h"
#include "libavutil/bprint.h"
-#include "avcodec.h"
+#include "bsf.h"
#include "bsf_internal.h"
+#include "codec_desc.h"
+#include "codec_par.h"
#define IS_EMPTY(pkt) (!(pkt)->data && !(pkt)->side_data_elems)
return;
ctx = *pctx;
- if (ctx->filter->close)
- ctx->filter->close(ctx);
+ if (ctx->internal) {
+ if (ctx->filter->close)
+ ctx->filter->close(ctx);
+ av_packet_free(&ctx->internal->buffer_pkt);
+ av_freep(&ctx->internal);
+ }
if (ctx->filter->priv_class && ctx->priv_data)
av_opt_free(ctx->priv_data);
- if (ctx->internal)
- av_packet_free(&ctx->internal->buffer_pkt);
- av_freep(&ctx->internal);
av_freep(&ctx->priv_data);
avcodec_parameters_free(&ctx->par_in);
.item_name = bsf_to_name,
.version = LIBAVUTIL_VERSION_INT,
.child_next = bsf_child_next,
- .child_class_next = ff_bsf_child_class_next,
+ .child_class_iterate = ff_bsf_child_class_iterate,
.category = AV_CLASS_CATEGORY_BITSTREAM_FILTER,
};
ret = AVERROR(ENOMEM);
goto fail;
}
-
- bsfi = av_mallocz(sizeof(*bsfi));
- if (!bsfi) {
- ret = AVERROR(ENOMEM);
- goto fail;
- }
- ctx->internal = bsfi;
-
- bsfi->buffer_pkt = av_packet_alloc();
- if (!bsfi->buffer_pkt) {
- ret = AVERROR(ENOMEM);
- goto fail;
- }
-
/* allocate priv data and init private options */
if (filter->priv_data_size) {
ctx->priv_data = av_mallocz(filter->priv_data_size);
av_opt_set_defaults(ctx->priv_data);
}
}
+ /* Allocate AVBSFInternal; must happen after priv_data has been allocated
+ * so that a filter->close needing priv_data is never called without. */
+ bsfi = av_mallocz(sizeof(*bsfi));
+ if (!bsfi) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
+ ctx->internal = bsfi;
+
+ bsfi->buffer_pkt = av_packet_alloc();
+ if (!bsfi->buffer_pkt) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
*pctx = ctx;
return 0;
"bitstream filter '%s'. Supported codecs are: ",
desc ? desc->name : "unknown", ctx->par_in->codec_id, ctx->filter->name);
for (i = 0; ctx->filter->codec_ids[i] != AV_CODEC_ID_NONE; i++) {
- desc = avcodec_descriptor_get(ctx->filter->codec_ids[i]);
+ enum AVCodecID codec_id = ctx->filter->codec_ids[i];
av_log(ctx, AV_LOG_ERROR, "%s (%d) ",
- desc ? desc->name : "unknown", ctx->filter->codec_ids[i]);
+ avcodec_get_name(codec_id), codec_id);
}
av_log(ctx, AV_LOG_ERROR, "\n");
return AVERROR(EINVAL);