Changeset 3ea5beab in ffmpeg

Timestamp:

May 3, 2014, 9:15:37 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

0c06ca7a

Parents:

0a5cc20d (diff), c6b42e85 (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 'c6b42e85493915a3c3891345f57422f9031a0b4f'

• commit 'c6b42e85493915a3c3891345f57422f9031a0b4f': flv: K&R formatting cosmetics

Conflicts:

libavcodec/flvdec.c

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

(No files)