diff options
| author | Jan Ekström <jeebjp@gmail.com> | 2020-11-23 17:36:20 +0200 |
|---|---|---|
| committer | Jan Ekström <jeebjp@gmail.com> | 2020-11-24 10:13:55 +0200 |
| commit | 8fbc139e6143297b8f88bc5145778787b64f4381 (patch) | |
| tree | 75b7894d6fb96e8c87f23bc65b564787f8b2108b | |
| parent | a66d1779bb1b33cc54b359b142dcbcd2827fa282 (diff) | |
| download | ffmpeg-8fbc139e6143297b8f88bc5145778787b64f4381.tar.gz | |
avcodec/av1{dec,parser}: move to ff_cbs_read_extradata_from_codec
This lets us re-utilize the extradata-related checks in the CBS
to add support for passing the AV1CodecConfigurationRecord
as extradata as-is without further filtering.
| -rw-r--r-- | libavcodec/av1_parser.c | 2 | ||||
| -rw-r--r-- | libavcodec/av1dec.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/av1_parser.c b/libavcodec/av1_parser.c index 14826d816e..181ff3a1be 100644 --- a/libavcodec/av1_parser.c +++ b/libavcodec/av1_parser.c @@ -73,7 +73,7 @@ static int av1_parser_parse(AVCodecParserContext *ctx, if (avctx->extradata_size && !s->parsed_extradata) { s->parsed_extradata = 1; - ret = ff_cbs_read(s->cbc, td, avctx->extradata, avctx->extradata_size); + ret = ff_cbs_read_extradata_from_codec(s->cbc, td, avctx); if (ret < 0) { av_log(avctx, AV_LOG_WARNING, "Failed to parse extradata.\n"); } diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index c1967f03bd..ce051d4e6d 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -616,8 +616,9 @@ static av_cold int av1_decode_init(AVCodecContext *avctx) return ret; if (avctx->extradata && avctx->extradata_size) { - ret = ff_cbs_read(s->cbc, &s->current_obu, avctx->extradata, - avctx->extradata_size); + ret = ff_cbs_read_extradata_from_codec(s->cbc, + &s->current_obu, + avctx); if (ret < 0) { av_log(avctx, AV_LOG_WARNING, "Failed to read extradata.\n"); return ret; |