summaryrefslogtreecommitdiffstats
path: root/libavcodec/trace_headers_bsf.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/trace_headers_bsf.c
parentcc1c94dacd0642ac1a6cad45deb65071f127d91a (diff)
downloadffmpeg-streaming-2651352988212531038326c44754ece1728c4a3b.zip
ffmpeg-streaming-2651352988212531038326c44754ece1728c4a3b.tar.gz
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/trace_headers_bsf.c')
-rw-r--r--libavcodec/trace_headers_bsf.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/trace_headers_bsf.c b/libavcodec/trace_headers_bsf.c
index 2f1369e..9c97dd4 100644
--- a/libavcodec/trace_headers_bsf.c
+++ b/libavcodec/trace_headers_bsf.c
@@ -27,7 +27,7 @@
typedef struct TraceHeadersContext {
- CodedBitstreamContext cbc;
+ CodedBitstreamContext *cbc;
} TraceHeadersContext;
@@ -40,21 +40,21 @@ static int trace_headers_init(AVBSFContext *bsf)
if (err < 0)
return err;
- ctx->cbc.trace_enable = 1;
- ctx->cbc.trace_level = AV_LOG_INFO;
+ ctx->cbc->trace_enable = 1;
+ ctx->cbc->trace_level = AV_LOG_INFO;
if (bsf->par_in->extradata) {
CodedBitstreamFragment ps;
av_log(bsf, AV_LOG_INFO, "Extradata\n");
- err = ff_cbs_read_extradata(&ctx->cbc, &ps, bsf->par_in);
+ err = ff_cbs_read_extradata(ctx->cbc, &ps, bsf->par_in);
if (err < 0) {
av_log(bsf, AV_LOG_ERROR, "Failed to read extradata.\n");
return err;
}
- ff_cbs_fragment_uninit(&ctx->cbc, &ps);
+ ff_cbs_fragment_uninit(ctx->cbc, &ps);
}
return 0;
@@ -97,11 +97,11 @@ static int trace_headers(AVBSFContext *bsf, AVPacket *out)
av_log(bsf, AV_LOG_INFO, "Packet: %d bytes%s.\n", in->size, tmp);
- err = ff_cbs_read_packet(&ctx->cbc, &au, in);
+ err = ff_cbs_read_packet(ctx->cbc, &au, in);
if (err < 0)
return err;
- ff_cbs_fragment_uninit(&ctx->cbc, &au);
+ ff_cbs_fragment_uninit(ctx->cbc, &au);
av_packet_move_ref(out, in);
av_packet_free(&in);
OpenPOWER on IntegriCloud