Changeset 508a5349 in ffmpeg

Timestamp:

Aug 6, 2013, 4:08:30 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

0a8f5eb2

Parents:

7565aaec (diff), 3dd5c95d (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> (08/06/13 16:07:59)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (08/06/13 16:08:30)

Message:

Merge commit '3dd5c95deef51d7fbf6f4458ba42d1335d2f1472'

• commit '3dd5c95deef51d7fbf6f4458ba42d1335d2f1472': riff: Move muxing code to a separate file

Conflicts:

configure
libavformat/riff.c

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

(No files)