[FFmpeg-cvslog] Merge commit '48c7fe5b5834a197f10a6eb56cbe7cda8ee32407' into release/2.2

Michael Niedermayer git at videolan.org
Mon Jun 1 13:42:27 CEST 2015


ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  1 13:32:23 2015 +0200| [43863fb13519c1f27b5435f9d415118054db5da0] | committer: Michael Niedermayer

Merge commit '48c7fe5b5834a197f10a6eb56cbe7cda8ee32407' into release/2.2

* commit '48c7fe5b5834a197f10a6eb56cbe7cda8ee32407':
  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=43863fb13519c1f27b5435f9d415118054db5da0
---





More information about the ffmpeg-cvslog mailing list