Changeset ffe33500 in ffmpeg

Timestamp:

Nov 1, 2013, 9:20:20 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

fc5fe480

Parents:

ec5e02d4 (diff), ee80cf74 (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 'ee80cf741a44115758e62399b7bde08d33161151'

• commit 'ee80cf741a44115758e62399b7bde08d33161151': avfilter: x86: K&R formatting cosmetics

Conflicts:

libavfilter/x86/vf_gradfun_init.c

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

(No files)