diff options
| author | John Rummell <jrummell@chromium.org> | 2017-06-14 14:43:04 -0700 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-06-20 17:14:17 -0300 |
| commit | 966a0a814d4e0a731a74949379076e1328ca3e78 (patch) | |
| tree | f97638d07f970d0d24f6434ddb823ae2e70ae343 /libavcodec | |
| parent | 8221c7170317b40d9ab8ca2810cd8f5afbd77e02 (diff) | |
| download | ffmpeg-966a0a814d4e0a731a74949379076e1328ca3e78.tar.gz | |
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>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/decode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 584d9d6241..f7dea930ed 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -462,7 +462,7 @@ FF_ENABLE_DEPRECATION_WARNINGS 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) { avctx->internal->skip_samples = AV_RL32(side) * avctx->internal->skip_samples_multiplier; discard_padding = AV_RL32(side + 4); |