Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Sep 2013 22:59:30 +0000 (00:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Sep 2013 22:59:35 +0000 (00:59 +0200)
* cehoyos/master:
  Read h264 headers from v4l2 to allow stream-copying.

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

Trivial merge