[FFmpeg-cvslog] Merge commit '930ffd46e1e742674aa7cc1c2450020c63b5015b'

Michael Niedermayer git at videolan.org
Tue Nov 4 22:30:50 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov  4 22:03:44 2014 +0100| [df82125acba5699c74ebe7e1c9293e328e9a9f8a] | committer: Michael Niedermayer

Merge commit '930ffd46e1e742674aa7cc1c2450020c63b5015b'

* commit '930ffd46e1e742674aa7cc1c2450020c63b5015b':
  aacsbr: change order of operation to prevent out of array read

Conflicts:
	libavcodec/aacsbr.c

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

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





More information about the ffmpeg-cvslog mailing list