[FFmpeg-cvslog] Merge commit '94bb1ce882a12b6d7a1fa32715a68121b39ee838'

Michael Niedermayer git at videolan.org
Tue May 5 22:57:09 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May  5 22:55:45 2015 +0200| [ff849e11e361a8e5161cf4f2896acfeeec1caeef] | committer: Michael Niedermayer

Merge commit '94bb1ce882a12b6d7a1fa32715a68121b39ee838'

* commit '94bb1ce882a12b6d7a1fa32715a68121b39ee838':
  alsdec: check sample pointer range in revert_channel_correlation

Conflicts:
	libavcodec/alsdec.c

See: afc7748d1f6abc4b3b1cc957b0fa6941837db3d0
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ff849e11e361a8e5161cf4f2896acfeeec1caeef
---





More information about the ffmpeg-cvslog mailing list