Skip to content
Snippets Groups Projects
Commit 966a0a81 authored by John Rummell's avatar John Rummell Committed by James Almer
Browse files

avcodec/decode: Update decode_simple_internal() to get the side data correctly.


Use avci->last_pkt_props to get the side data. Using |pkt| doesn't work
when FF_API_MERGE_SD is set, as the compressed side data is expanded into
|tmp|, leaving the original |pkt| unchanged.

Signed-off-by: default avatarJames Almer <jamrial@gmail.com>
parent 8221c717
No related branches found
No related tags found
No related merge requests found
...@@ -462,7 +462,7 @@ FF_ENABLE_DEPRECATION_WARNINGS ...@@ -462,7 +462,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
frame->sample_rate = avctx->sample_rate; frame->sample_rate = avctx->sample_rate;
} }
side= av_packet_get_side_data(pkt, AV_PKT_DATA_SKIP_SAMPLES, &side_size); side= av_packet_get_side_data(avci->last_pkt_props, AV_PKT_DATA_SKIP_SAMPLES, &side_size);
if(side && side_size>=10) { if(side && side_size>=10) {
avctx->internal->skip_samples = AV_RL32(side) * avctx->internal->skip_samples_multiplier; avctx->internal->skip_samples = AV_RL32(side) * avctx->internal->skip_samples_multiplier;
discard_padding = AV_RL32(side + 4); discard_padding = AV_RL32(side + 4);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment