diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-30 21:03:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-30 21:20:24 +0200 |
| commit | 7d1cfbbc3e8405a185611eb1132bd3d3a98b9f55 (patch) | |
| tree | daf3e1d274e818c1bb9600c20f935f2b89d27de5 /libavformat | |
| parent | 3ef5702926c495232ffe685303ba8661bdff1149 (diff) | |
| parent | 5ecabd3c54b7c802522dc338838c9a4c2dc42948 (diff) | |
| download | ffmpeg-7d1cfbbc3e8405a185611eb1132bd3d3a98b9f55.tar.gz | |
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>
Diffstat (limited to 'libavformat')
0 files changed, 0 insertions, 0 deletions