summaryrefslogtreecommitdiff
path: root/libavcodec/vaapi_encode_mpeg2.c
diff options
context:
space:
mode:
authorMark Thompson <sw@jkqxz.net>2017-11-09 01:03:57 +0000
committerMark Thompson <sw@jkqxz.net>2018-02-20 22:04:12 +0000
commit2651352988212531038326c44754ece1728c4a3b (patch)
tree0a881dcc977760e4181e7018028d790806b72c15 /libavcodec/vaapi_encode_mpeg2.c
parentcc1c94dacd0642ac1a6cad45deb65071f127d91a (diff)
cbs: Allocate the context inside the init function
... instead of making callers allocate it themselves. This is more consistent with other APIs in libav.
Diffstat (limited to 'libavcodec/vaapi_encode_mpeg2.c')
-rw-r--r--libavcodec/vaapi_encode_mpeg2.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/vaapi_encode_mpeg2.c b/libavcodec/vaapi_encode_mpeg2.c
index 954b60733c..39f1e4b5f2 100644
--- a/libavcodec/vaapi_encode_mpeg2.c
+++ b/libavcodec/vaapi_encode_mpeg2.c
@@ -52,7 +52,7 @@ typedef struct VAAPIEncodeMPEG2Context {
unsigned int f_code_horizontal;
unsigned int f_code_vertical;
- CodedBitstreamContext cbc;
+ CodedBitstreamContext *cbc;
CodedBitstreamFragment current_fragment;
} VAAPIEncodeMPEG2Context;
@@ -65,7 +65,7 @@ static int vaapi_encode_mpeg2_write_fragment(AVCodecContext *avctx,
VAAPIEncodeMPEG2Context *priv = ctx->priv_data;
int err;
- err = ff_cbs_write_fragment_data(&priv->cbc, frag);
+ err = ff_cbs_write_fragment_data(priv->cbc, frag);
if (err < 0) {
av_log(avctx, AV_LOG_ERROR, "Failed to write packed header.\n");
return err;
@@ -92,7 +92,7 @@ static int vaapi_encode_mpeg2_add_header(AVCodecContext *avctx,
VAAPIEncodeMPEG2Context *priv = ctx->priv_data;
int err;
- err = ff_cbs_insert_unit_content(&priv->cbc, frag, -1, type, header);
+ err = ff_cbs_insert_unit_content(priv->cbc, frag, -1, type, header);
if (err < 0) {
av_log(avctx, AV_LOG_ERROR, "Failed to add header: "
"type = %d.\n", type);
@@ -132,7 +132,7 @@ static int vaapi_encode_mpeg2_write_sequence_header(AVCodecContext *avctx,
err = vaapi_encode_mpeg2_write_fragment(avctx, data, data_len, frag);
fail:
- ff_cbs_fragment_uninit(&priv->cbc, frag);
+ ff_cbs_fragment_uninit(priv->cbc, frag);
return 0;
}
@@ -157,7 +157,7 @@ static int vaapi_encode_mpeg2_write_picture_header(AVCodecContext *avctx,
err = vaapi_encode_mpeg2_write_fragment(avctx, data, data_len, frag);
fail:
- ff_cbs_fragment_uninit(&priv->cbc, frag);
+ ff_cbs_fragment_uninit(priv->cbc, frag);
return 0;
}