aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2018-03-11 14:02:10 -0300
committerJames Almer <jamrial@gmail.com>2018-03-11 15:40:37 -0300
commit11bef2fe7232d290541a112efb2d360600c7b917 (patch)
tree8f4b4bf885af15f1e6ef38af26aaa6794ee59d5e
parent9c6dd9d6248897a2d8dd4ede948c166e5a579a4b (diff)
downloadffmpeg-11bef2fe7232d290541a112efb2d360600c7b917.tar.gz
avcodec/mov2textsub: move the reference in the bsf internal buffer
There's no need to allocate a new packet for it. Reviewed-by: Mark Thompson <sw@jkqxz.net> Signed-off-by: James Almer <jamrial@gmail.com>
-rw-r--r--libavcodec/movsub_bsf.c28
1 files changed, 8 insertions, 20 deletions
diff --git a/libavcodec/movsub_bsf.c b/libavcodec/movsub_bsf.c
index 3cb1183cd8..5878607061 100644
--- a/libavcodec/movsub_bsf.c
+++ b/libavcodec/movsub_bsf.c
@@ -62,35 +62,23 @@ const AVBitStreamFilter ff_text2movsub_bsf = {
.filter = text2movsub,
};
-static int mov2textsub(AVBSFContext *ctx, AVPacket *out)
+static int mov2textsub(AVBSFContext *ctx, AVPacket *pkt)
{
- AVPacket *in;
int ret = 0;
- ret = ff_bsf_get_packet(ctx, &in);
+ ret = ff_bsf_get_packet_ref(ctx, pkt);
if (ret < 0)
return ret;
- if (in->size < 2) {
- ret = AVERROR_INVALIDDATA;
- goto fail;
+ if (pkt->size < 2) {
+ av_packet_unref(pkt);
+ 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);
+ pkt->data += 2;
+ pkt->size = FFMIN(pkt->size - 2, AV_RB16(pkt->data));
-fail:
- if (ret < 0)
- av_packet_unref(out);
- av_packet_free(&in);
- return ret;
+ return 0;
}
const AVBitStreamFilter ff_mov2textsub_bsf = {