[FFmpeg-cvslog] Merge commit '4c995fafd861f537360b3717901cdbed6a6844e7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Oct 16 13:19:11 2012 +0200| [9270a2b374eae02c3588ff9a36af298d19f006c8] | committer: Michael Niedermayer

Merge commit '4c995fafd861f537360b3717901cdbed6a6844e7'

* commit '4c995fafd861f537360b3717901cdbed6a6844e7':
  configure: simplify get_version() function
  build: support asan and tsan toolchain shortcuts
  rmdec: Move SIPR code shared with Matroska demuxer to a separate file

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

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