Commit 8c15f9d7 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: Copy audio side data too. This fixes handling of some rare nellymoser files that change the sample rate mid stream (sample file at: http://trac.videolan.org/vlc/ticket/5586)
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents dd974c1b 59a58884
......@@ -2152,6 +2152,9 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
pkt_temp->data = pkt->data;
pkt_temp->size = pkt->size;
pkt_temp->flags = pkt->flags;
pkt_temp->side_data = pkt->side_data;
pkt_temp->side_data_elems = pkt->side_data_elems;
/* if update the audio clock with the pts */
if (pkt->pts != AV_NOPTS_VALUE) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment