mirror of https://git.ffmpeg.org/ffmpeg.git
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: James Almer <jamrial@gmail.com>
This commit is contained in:
parent
8221c71703
commit
966a0a814d
|
@ -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);
|
||||||
|
|
Loading…
Reference in New Issue