X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fmovsub_bsf.c;h=cd48aa7bb8f724c7034b118836fcc86f43cef773;hb=9d6be83085ccb1f52b923064eb93566ddbb0a1f7;hp=3cb1183cd89e342a3ea83c37e81bc31d0a3e394f;hpb=706d2c66e8e59cfda32e57713bc37e5558a25815;p=ffmpeg

diff --git a/libavcodec/movsub_bsf.c b/libavcodec/movsub_bsf.c
index 3cb1183cd89..cd48aa7bb8f 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->size  = FFMIN(pkt->size - 2, AV_RB16(pkt->data));
+    pkt->data += 2;
 
-fail:
-    if (ret < 0)
-        av_packet_unref(out);
-    av_packet_free(&in);
-    return ret;
+    return 0;
 }
 
 const AVBitStreamFilter ff_mov2textsub_bsf = {