diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-19 21:44:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-19 21:44:58 +0100 |
| commit | e821910a21510c2423c345b615602b42af26a70a (patch) | |
| tree | 3ab3c71873b2077a21007c26d94ce38400b1d372 /libavformat/allformats.c | |
| parent | dfe5a9f022b38ba292212ce2daff60221e411e10 (diff) | |
| parent | 062cd5a975ff7bd6fb91f9b4d1d9d102a7545499 (diff) | |
| download | ffmpeg-e821910a21510c2423c345b615602b42af26a70a.tar.gz | |
Merge commit '062cd5a975ff7bd6fb91f9b4d1d9d102a7545499'
* commit '062cd5a975ff7bd6fb91f9b4d1d9d102a7545499':
lavf: Add DSS demuxer
Conflicts:
libavformat/Makefile
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/allformats.c')
| -rw-r--r-- | libavformat/allformats.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/allformats.c b/libavformat/allformats.c index ad2e649e54..26ccc27a17 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -110,6 +110,7 @@ void av_register_all(void) REGISTER_MUXDEMUX(DNXHD, dnxhd); REGISTER_DEMUXER (DSF, dsf); REGISTER_DEMUXER (DSICIN, dsicin); + REGISTER_DEMUXER (DSS, dss); REGISTER_MUXDEMUX(DTS, dts); REGISTER_DEMUXER (DTSHD, dtshd); REGISTER_MUXDEMUX(DV, dv); |