Changeset f34cceb1 in ffmpeg

Timestamp:

Mar 4, 2014, 2:41:49 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

2b0ff8d6

Parents:

ec6d043f (diff), 06fed440 (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (03/04/14 02:41:45)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/04/14 02:41:49)

Message:

Merge remote-tracking branch 'lukaszmluki/master'

• lukaszmluki/master: lavd/avdevice: add device iterators lavd: add categories to device implementations lavu/log: add device categories

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

(No files)