mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-24 03:59:43 +00:00
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>
This commit is contained in:
commit
8c15f9d79c
3
ffplay.c
3
ffplay.c
@ -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) {
|
||||
|
Loading…
Reference in New Issue
Block a user