Changeset f18db82f in ffmpeg

Timestamp:

Oct 10, 2013, 7:19:05 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

2066975

Parents:

7824b5f6 (diff), 61cd19b (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> (10/10/13 07:18:16)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (10/10/13 07:19:05)

Message:

Merge commit '61cd19b8bc32185c8caf64d89d1b0909877a0707'

• commit '61cd19b8bc32185c8caf64d89d1b0909877a0707': vmnc: Port to bytestream2

Conflicts:

libavcodec/vmnc.c

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

(No files)