diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-01 21:35:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-01 21:35:20 +0100 |
| commit | 8c15f9d79c9bf0565e721097e1b022fc2023728d (patch) | |
| tree | b2989cf4f168b6b66887b5bc401b71bf6f30a869 | |
| parent | dd974c1bc1dc3116fffdbbb28a4ebfce7e1318ee (diff) | |
| parent | 59a58884b9f2fb42720d78e1af643c0f0b46b2ac (diff) | |
| download | ffmpeg-8c15f9d79c9bf0565e721097e1b022fc2023728d.tar.gz | |
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: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | ffplay.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -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) { |