Changeset 02a31f6a in ffmpeg

Timestamp:

Oct 23, 2013, 5:45:07 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

92f649b4

Parents:

4c18c314 (diff), 2c993e8b (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 remote-tracking branch 'qatar/master'

• qatar/master: golomb: K&R formatting cosmetics

Conflicts:

libavcodec/golomb.h

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

(No files)