Changeset 5b03caf9 in ffmpeg

Timestamp:

Apr 1, 2014, 1:51:52 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

5628b9f5

Parents:

013aa222 (diff), 6d9ccee4 (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> (04/01/14 01:51:32)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/01/14 01:51:52)

Message:

Merge commit '6d9ccee4519f41155c88655c77bfb1ef085797fd'

• commit '6d9ccee4519f41155c88655c77bfb1ef085797fd': sgi: set the row boundary to the correct value

Conflicts:

libavcodec/sgidec.c

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

(No files)