Changeset d3b379b9 in ffmpeg

Timestamp:

Apr 16, 2011, 1:55:48 AM (14 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

09a1416d

Parents:

f6302ad6 (diff), 4d012eb5 (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> (04/16/11 01:55:42)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/16/11 01:55:48)

Message:

Merge commit '4d012eb541ed7f35e00c87035a470d9f0a24a6e8'

• commit '4d012eb541ed7f35e00c87035a470d9f0a24a6e8': xwma: Fix wrong printf format expression. xwma demuxer: typos oggdec: simplify audio chained ogg streams support

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)