Changeset 2beb8152 in ffmpeg

Timestamp:

Mar 9, 2014, 12:05:37 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

b39e8950

Parents:

0c1353ae (diff), 8c09532 (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 '8c09532672d7d3196ec52afefa2c96633bc17b62'

• commit '8c09532672d7d3196ec52afefa2c96633bc17b62': rv10: K&R formatting cosmetics

Conflicts:

libavcodec/rv10.c

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

(No files)