---
libavcodec/cbs_vp9.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/libavcodec/cbs_vp9.c b/libavcodec/cbs_vp9.c
index bd172100fc..df480f42e5 100644
--- a/libavcodec/cbs_vp9.c
+++ b/libavcodec/cbs_vp9.c
@@ -474,13 +474,6 @@ static int cbs_vp9_split_fragment(CodedBitstreamContext
*ctx,
return 0;
}
-static void cbs_vp9_free_frame(void *opaque, uint8_t *content)
-{
- VP9RawFrame *frame = (VP9RawFrame*)content;
- av_buffer_unref(&frame->data_ref);
- av_freep(&frame);
-}
-
static int cbs_vp9_read_unit(CodedBitstreamContext *ctx,
CodedBitstreamUnit *unit)
{
@@ -492,8 +485,7 @@ static int cbs_vp9_read_unit(CodedBitstreamContext *ctx,
if (err < 0)
return err;
- err = ff_cbs_alloc_unit_content(ctx, unit, sizeof(*frame),
- &cbs_vp9_free_frame);
+ err = ff_cbs_alloc_unit_content2(ctx, unit);
if (err < 0)
return err;
frame = unit->content;
@@ -678,11 +670,18 @@ static void cbs_vp9_close(CodedBitstreamContext *ctx)
av_freep(&priv->write_buffer);
}
+static const CodedBitstreamUnitTypeDescriptor cbs_vp9_unit_types[] = {
+ CBS_UNIT_TYPE_INTERNAL_REF(0, VP9RawFrame, data),
+ CBS_UNIT_TYPE_END_OF_LIST
+};
+
const CodedBitstreamType ff_cbs_type_vp9 = {
.codec_id = AV_CODEC_ID_VP9,
.priv_data_size = sizeof(CodedBitstreamVP9Context),
+ .unit_types = cbs_vp9_unit_types,
+
.split_fragment = &cbs_vp9_split_fragment,
.read_unit = &cbs_vp9_read_unit,
.write_unit = &cbs_vp9_write_unit,
--
2.20.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
