Changeset e136579 in ffmpeg

Timestamp:

Feb 14, 2014, 8:50:21 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

f1190576

Parents:

efec857c (diff), 3fbad007 (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> (02/14/14 20:49:52)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/14/14 20:50:21)

Message:

Merge commit '3fbad00714698f59c6326edfcc63db87f525e7c0'

• commit '3fbad00714698f59c6326edfcc63db87f525e7c0': utvideoenc: Enable support for multiple slices and use them

Conflicts:

libavcodec/utvideoenc.c
tests/fate/utvideo.mak

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

(No files)