Changeset 1344c045 in ffmpeg

Timestamp:

Nov 2, 2013, 9:30:30 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

641358ad

Parents:

0b82fdcc (diff), dc6ea00c (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 'dc6ea00cd2b91b591e6726e5bf1d5e03a4a9bdd0'

• commit 'dc6ea00cd2b91b591e6726e5bf1d5e03a4a9bdd0': mpeg4video: K&R formatting cosmetics

Conflicts:

libavcodec/mpeg4video.h

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

(No files)