Changeset 8c15f9d7 in ffmpeg

Timestamp:

Dec 1, 2011, 8:35:20 PM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

18abf46

Parents:

dd974c1b (diff), 59a58884 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (12/01/11 20:35:10)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (12/01/11 20:35:20)

Message:

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>

(No files)