Merge commit '4c995fafd861f537360b3717901cdbed6a6844e7'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 16 Oct 2012 11:19:11 +0000 (13:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 16 Oct 2012 11:20:46 +0000 (13:20 +0200)
commit9270a2b374eae02c3588ff9a36af298d19f006c8
treebce36468c80d453d10fbe2385711b7a5b2c8ce41
parent36b3b2376dd99e035f5acc389f8c506647146e14
parent4c995fafd861f537360b3717901cdbed6a6844e7
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@gmx.at>
configure
libavformat/Makefile
libavformat/matroskadec.c
libavformat/rm.h
libavformat/rmdec.c
libavformat/rmsipr.c
libavformat/rmsipr.h