Changeset ceb0d79f in ffmpeg

Timestamp:

Mar 18, 2014, 12:19:24 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

7ae5cadb

Parents:

48f7d5f0 (diff), 86ba2327 (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> (03/18/14 12:16:56)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/18/14 12:19:24)

Message:

Merge commit '86ba2327e1cf35c6f77d5fb516a1a7a8dce0b98a'

• commit '86ba2327e1cf35c6f77d5fb516a1a7a8dce0b98a': mpegts: K&R formatting cosmetics

Conflicts:

libavformat/mpegts.c

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

(No files)