[FFmpeg-cvslog] Merge remote-tracking branch 'lukaszmluki/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar  4 03:41:45 2014 +0100| [f34cceb1fc58076ac69bef44bf07d8373e58f83d] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f34cceb1fc58076ac69bef44bf07d8373e58f83d
---