[FFmpeg-cvslog] Merge commit '5ecabd3c54b7c802522dc338838c9a4c2dc42948'
Michael Niedermayer
git at videolan.org
Sat May 30 21:28:20 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat May 30 21:03:16 2015 +0200| [7d1cfbbc3e8405a185611eb1132bd3d3a98b9f55] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7d1cfbbc3e8405a185611eb1132bd3d3a98b9f55
---
More information about the ffmpeg-cvslog
mailing list