Changeset 4c18c314 in ffmpeg

Timestamp:

Oct 23, 2013, 5:37:09 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

02a31f6a

Parents:

3a75c4e9 (diff), 1ce3ec24 (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> (10/23/13 17:26:59)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (10/23/13 17:37:09)

Message:

Merge commit '1ce3ec24b35d9d549b12f17bd7fd391abaf3a6f7'

• commit '1ce3ec24b35d9d549b12f17bd7fd391abaf3a6f7': h263: K&R formatting cosmetics

Conflicts:

libavcodec/h263dec.c

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

(No files)