Changeset 7d1cfbbc in ffmpeg

Timestamp:

May 30, 2015, 7:20:24 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

e9d646f4

Parents:

3ef57029 (diff), 5ecabd3c (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> (05/30/15 19:03:16)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (05/30/15 19:20:24)

Message:

Merge commit '5ecabd3c54b7c802522dc338838c9a4c2dc42948'

• commit '5ecabd3c54b7c802522dc338838c9a4c2dc42948': msrle: Use FFABS to determine the frame size in msrle_decode_pal4

Conflicts:

libavcodec/msrledec.c

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

(No files)