Merge commit 'ce5870a3a8f2b10668ee4f04c2ae0287f66f31b2'

* commit 'ce5870a3a8f2b10668ee4f04c2ae0287f66f31b2': cbs: Refcount all the things! Some changes for bitstream API.

Mark Thompson committed 8 years ago

Commit 0cc8e342 parents b656fa7 ce5870a15 files · +404 −279Browse files

Showing the changes to libavcodec/vaapi_encode_mpeg2.c (1 of 15 files). Show all

Unified · Split

@@ -92,7 +92,7 @@ static int vaapi_encode_mpeg2_add_header(AVCodecContext *avctx, · 91 unmodified lines
92	VAAPIEncodeMPEG2Context *priv = ctx->priv_data;	92	VAAPIEncodeMPEG2Context *priv = ctx->priv_data;
93	int err;	93	int err;
94		94
95	err = ff_cbs_insert_unit_content(priv->cbc, frag, -1, type, header);	95	err = ff_cbs_insert_unit_content(priv->cbc, frag, -1, type, header, NULL);
96	if (err < 0) {	96	if (err < 0) {
97	av_log(avctx, AV_LOG_ERROR, "Failed to add header: "	97	av_log(avctx, AV_LOG_ERROR, "Failed to add header: "
98	"type = %d.\n", type);	98	"type = %d.\n", type);

Keyboard shortcuts