This reverts commit 7a15955a. This was never actually used; it was inadequate for V4L. Conflicts: include/vlc_demux.h