summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPetri Hintukainen <phintuka@users.sourceforge.net>2014-05-21 11:37:12 +0300
committerPetri Hintukainen <phintuka@users.sourceforge.net>2014-05-21 11:37:12 +0300
commitbcccbed31536109581e87bae1975f889b9412d0e (patch)
tree0478f648d3559d8b5c3a075258da20cdb8506ee7 /src
parentff3776a79fb1115830a96976613b8ef801353632 (diff)
downloadxine-lib-bcccbed31536109581e87bae1975f889b9412d0e.tar.gz
xine-lib-bcccbed31536109581e87bae1975f889b9412d0e.tar.bz2
demux opus from matroska.
Diffstat (limited to 'src')
-rw-r--r--src/demuxers/demux_matroska.c5
-rw-r--r--src/demuxers/matroska.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c
index 058370b89..65b531aa8 100644
--- a/src/demuxers/demux_matroska.c
+++ b/src/demuxers/demux_matroska.c
@@ -1425,6 +1425,11 @@ static int parse_track_entry(demux_matroska_t *this, matroska_track_t *track) {
track->buf_type = BUF_AUDIO_VORBIS;
init_codec = init_codec_xiph;
+ } else if (!strcmp(track->codec_id, MATROSKA_CODEC_ID_A_OPUS)) {
+ lprintf("MATROSKA_CODEC_ID_A_OPUS\n");
+ track->buf_type = BUF_AUDIO_OPUS;
+ init_codec = init_codec_audio;
+
} else if (!strcmp(track->codec_id, MATROSKA_CODEC_ID_A_ACM)) {
xine_waveformatex *wfh;
lprintf("MATROSKA_CODEC_ID_A_ACM\n");
diff --git a/src/demuxers/matroska.h b/src/demuxers/matroska.h
index 458e2cfc3..44942b086 100644
--- a/src/demuxers/matroska.h
+++ b/src/demuxers/matroska.h
@@ -337,6 +337,7 @@ struct matroska_track_s {
#define MATROSKA_CODEC_ID_A_REAL_RALF "A_REAL/RALF"
#define MATROSKA_CODEC_ID_A_REAL_ATRC "A_REAL/ATRC"
#define MATROSKA_CODEC_ID_A_FLAC "A_FLAC"
+#define MATROSKA_CODEC_ID_A_OPUS "A_OPUS"
#define MATROSKA_CODEC_ID_S_TEXT_UTF8 "S_TEXT/UTF8"
#define MATROSKA_CODEC_ID_S_TEXT_SSA "S_TEXT/SSA"