RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Michael Niedermayer 2011-12-01 21:35:10 +01:00
parent dd974c1bc1 59a58884b9
commit 8c15f9d79c
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ffplay.c
View File

@ -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) {