[FFmpeg-cvslog] Merge commit '70642090960c35dcd6da941c869bdf55d4f3bb00' into release/2.4
Michael Niedermayer
git at videolan.org
Sun May 31 00:12:58 CEST 2015
ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sat May 30 23:46:38 2015 +0200| [2c180cfc5dd549c90cbbb3b02e9c67ce6b55cbec] | committer: Michael Niedermayer
Merge commit '70642090960c35dcd6da941c869bdf55d4f3bb00' into release/2.4
* commit '70642090960c35dcd6da941c869bdf55d4f3bb00':
msrle: Use FFABS to determine the frame size in msrle_decode_pal4
Conflicts:
libavcodec/msrledec.c
See: f7e1367f58263593e6cee3c282f7277d7ee9d553
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2c180cfc5dd549c90cbbb3b02e9c67ce6b55cbec
---
More information about the ffmpeg-cvslog
mailing list