Changeset f3968ab4 in ffmpeg

Timestamp:

Oct 4, 2013, 10:01:17 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

ee77140a

Parents:

90e1fc8b (diff), 49fe9c05 (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.

Message:

Merge commit '49fe9c05f97bc2cfafd8fdcfea2f313d7c8e2c48'

• commit '49fe9c05f97bc2cfafd8fdcfea2f313d7c8e2c48': oggparsevorbis: K&R formatting cosmetics

Conflicts:

libavformat/oggparsevorbis.c

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

(No files)