Changeset cf942994 in ffmpeg

Timestamp:

Sep 1, 2013, 10:59:35 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

b339dccb

Parents:

21dc3a3c (diff), e337c9d5 (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> (09/01/13 22:59:30)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (09/01/13 22:59:35)

Message:

Merge remote-tracking branch 'cehoyos/master'

• cehoyos/master: Read h264 headers from v4l2 to allow stream-copying.

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

(No files)