@@ -64,33 +64,21 @@ const AVBitStreamFilter ff_text2movsub_bsf = {
static int mov2textsub(AVBSFContext *ctx, AVPacket *out)
{
- AVPacket *in;
int ret = 0;
- ret = ff_bsf_get_packet(ctx, &in);
+ ret = ff_bsf_get_packet_ref(ctx, out);
if (ret < 0)
return ret;
- if (in->size < 2) {
- ret = AVERROR_INVALIDDATA;
- goto fail;
+ if (out->size < 2) {
+ av_packet_unref(out);
+ return AVERROR_INVALIDDATA;
}
- ret = av_new_packet(out, FFMIN(in->size - 2, AV_RB16(in->data)));
- if (ret < 0)
- goto fail;
-
- ret = av_packet_copy_props(out, in);
- if (ret < 0)
- goto fail;
-
- memcpy(out->data, in->data + 2, out->size);
+ out->data += 2;
+ out->size = FFMIN(out->size - 2, AV_RB16(out->data));
-fail:
- if (ret < 0)
- av_packet_unref(out);
- av_packet_free(&in);
- return ret;
+ return 0;
}
const AVBitStreamFilter ff_mov2textsub_bsf = {
There's no need to allocate a new packet for it. Signed-off-by: James Almer <jamrial@gmail.com> --- libavcodec/movsub_bsf.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-)