diff options
| author | Mark Thompson <sw@jkqxz.net> | 2017-11-09 01:03:57 +0000 |
|---|---|---|
| committer | Mark Thompson <sw@jkqxz.net> | 2018-02-20 22:04:12 +0000 |
| commit | 2651352988212531038326c44754ece1728c4a3b (patch) | |
| tree | 0a881dcc977760e4181e7018028d790806b72c15 /libavcodec/vaapi_encode_h264.c | |
| parent | cc1c94dacd0642ac1a6cad45deb65071f127d91a (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_h264.c')
| -rw-r--r-- | libavcodec/vaapi_encode_h264.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index b7eee756e1..a9f8832e20 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -78,7 +78,7 @@ typedef struct VAAPIEncodeH264Context { int cpb_delay; int dpb_delay; - CodedBitstreamContext cbc; + CodedBitstreamContext *cbc; CodedBitstreamFragment current_access_unit; int aud_needed; int sei_needed; @@ -104,7 +104,7 @@ static int vaapi_encode_h264_write_access_unit(AVCodecContext *avctx, VAAPIEncodeH264Context *priv = ctx->priv_data; int err; - err = ff_cbs_write_fragment_data(&priv->cbc, au); + err = ff_cbs_write_fragment_data(priv->cbc, au); if (err < 0) { av_log(avctx, AV_LOG_ERROR, "Failed to write packed header.\n"); return err; @@ -132,7 +132,7 @@ static int vaapi_encode_h264_add_nal(AVCodecContext *avctx, H264RawNALUnitHeader *header = nal_unit; int err; - err = ff_cbs_insert_unit_content(&priv->cbc, au, -1, + err = ff_cbs_insert_unit_content(priv->cbc, au, -1, header->nal_unit_type, nal_unit); if (err < 0) { av_log(avctx, AV_LOG_ERROR, "Failed to add NAL unit: " @@ -168,7 +168,7 @@ static int vaapi_encode_h264_write_sequence_header(AVCodecContext *avctx, err = vaapi_encode_h264_write_access_unit(avctx, data, data_len, au); fail: - ff_cbs_fragment_uninit(&priv->cbc, au); + ff_cbs_fragment_uninit(priv->cbc, au); return err; } @@ -195,7 +195,7 @@ static int vaapi_encode_h264_write_slice_header(AVCodecContext *avctx, err = vaapi_encode_h264_write_access_unit(avctx, data, data_len, au); fail: - ff_cbs_fragment_uninit(&priv->cbc, au); + ff_cbs_fragment_uninit(priv->cbc, au); return err; } @@ -255,7 +255,7 @@ static int vaapi_encode_h264_write_extra_header(AVCodecContext *avctx, if (err < 0) goto fail; - ff_cbs_fragment_uninit(&priv->cbc, au); + ff_cbs_fragment_uninit(priv->cbc, au); *type = VAEncPackedHeaderRawData; return 0; @@ -277,7 +277,7 @@ static int vaapi_encode_h264_write_extra_header(AVCodecContext *avctx, } fail: - ff_cbs_fragment_uninit(&priv->cbc, au); + ff_cbs_fragment_uninit(priv->cbc, au); return err; } |