mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '5ecabd3c54b7c802522dc338838c9a4c2dc42948'
* commit '5ecabd3c54b7c802522dc338838c9a4c2dc42948':
msrle: Use FFABS to determine the frame size in msrle_decode_pal4
Conflicts:
libavcodec/msrledec.c
See: f7e1367f58
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
7d1cfbbc3e