Changeset 98277fd1 in ffmpeg

Timestamp:

Jul 6, 2013, 10:08:43 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

561e0513

Parents:

0844630e (diff), 4972e5a1 (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: bitstream_filter: K&R formatting cosmetics

Conflicts:

libavcodec/bitstream_filter.c

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

(No files)