Changeset a5a9bcc8 in ffmpeg

Timestamp:

Jun 8, 2013, 10:30:15 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

f973f174

Parents:

d0b27eab (diff), f32aefcf (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 'f32aefcf349f2f1367f0143782397643416d18f3'

• commit 'f32aefcf349f2f1367f0143782397643416d18f3': faxcompr: K&R formatting cosmetics

Conflicts:

libavcodec/faxcompr.c

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

(No files)