diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-16 13:19:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-16 13:20:46 +0200 |
| commit | 9270a2b374eae02c3588ff9a36af298d19f006c8 (patch) | |
| tree | bce36468c80d453d10fbe2385711b7a5b2c8ce41 /libavformat/matroskadec.c | |
| parent | 36b3b2376dd99e035f5acc389f8c506647146e14 (diff) | |
| parent | 4c995fafd861f537360b3717901cdbed6a6844e7 (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>
Diffstat (limited to 'libavformat/matroskadec.c')
| -rw-r--r-- | libavformat/matroskadec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index a270f0dfc7..ddebf2b697 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -35,7 +35,7 @@ /* For ff_codec_get_id(). */ #include "riff.h" #include "isom.h" -#include "rm.h" +#include "rmsipr.h" #include "matroska.h" #include "libavcodec/bytestream.h" #include "libavcodec/mpeg4audio.h" |