Changeset 2c6e693 in ffmpeg

Timestamp:

Nov 19, 2013, 4:53:14 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

8983dea4

Parents:

18df75fa (diff), d234c7a0 (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> (11/19/13 15:52:23)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/19/13 16:53:14)

Message:

Merge commit 'd234c7a07c1313fd215e8e242492bf71f5f3321e'

• commit 'd234c7a07c1313fd215e8e242492bf71f5f3321e': mpeg4videodec: K&R formatting cosmetics

Conflicts:

libavcodec/mpeg4videodec.c

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

(No files)