OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 36b3b23 4c995fa)
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
treebce36468c80d453d10fbe2385711b7a5b2c8ce41tree | snapshot
parent36b3b2376dd99e035f5acc389f8c506647146e14commit | diff
parent4c995fafd861f537360b3717901cdbed6a6844e7commit | diff
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 diff1 | diff2 | blob | history
libavformat/Makefile diff1 | diff2 | blob | history
libavformat/matroskadec.c diff1 | diff2 | blob | history
libavformat/rm.h diff1 | diff2 | blob | history
libavformat/rmdec.c diff1 | diff2 | blob | history
libavformat/rmsipr.c | diff2 | blob | history
libavformat/rmsipr.h | diff2 | blob | history
external/ffmpeg
About OSDN
Find Software
Develop Software
Help