Changeset b043d80b in ffmpeg

Timestamp:

Aug 31, 2013, 11:47:04 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

4fa00c56

Parents:

4273236e (diff), 21fd2f84 (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: pcm_bluray: cosmetics

Conflicts:

libavcodec/pcm-bluray.c

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

(No files)