falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

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>
tags/n2.7
Michael Niedermayer 10 years ago
parent
3ef5702926 5ecabd3c54
commit
7d1cfbbc3e
Split View
Diff Options
Show Stats Download Patch File Download Diff File

Diff Content Not Available