summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPetri Hintukainen <phintuka@users.sourceforge.net>2012-06-08 10:16:50 +0300
committerPetri Hintukainen <phintuka@users.sourceforge.net>2012-06-08 10:16:50 +0300
commiteb47c6a1a57022606002bb0661ee443420d9d23f (patch)
tree73b01dd6872b5556827a0a38a623483442fd91b5 /src
parent7128f934f5628a4cf389be6cd09968f9d4402fe5 (diff)
downloadxine-lib-eb47c6a1a57022606002bb0661ee443420d9d23f.tar.gz
xine-lib-eb47c6a1a57022606002bb0661ee443420d9d23f.tar.bz2
Added support for flac in 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 32feacf28..ea1ee718f 100644
--- a/src/demuxers/demux_matroska.c
+++ b/src/demuxers/demux_matroska.c
@@ -1395,6 +1395,11 @@ static int parse_track_entry(demux_matroska_t *this, matroska_track_t *track) {
track->buf_type = BUF_AUDIO_EAC3;
init_codec = init_codec_audio;
+ } else if (!strcmp(track->codec_id, MATROSKA_CODEC_ID_A_FLAC)) {
+ lprintf("MATROSKA_CODEC_ID_A_FLAC\n");
+ track->buf_type = BUF_AUDIO_FLAC;
+ init_codec = init_codec_audio;
+
} else if (!strcmp(track->codec_id, MATROSKA_CODEC_ID_A_DTS)) {
lprintf("MATROSKA_CODEC_ID_A_DTS\n");
track->buf_type = BUF_AUDIO_DTS;
diff --git a/src/demuxers/matroska.h b/src/demuxers/matroska.h
index 41b27fa3f..2edc4a646 100644
--- a/src/demuxers/matroska.h
+++ b/src/demuxers/matroska.h
@@ -334,6 +334,7 @@ struct matroska_track_s {
#define MATROSKA_CODEC_ID_A_REAL_SIPR "A_REAL/SIPR"
#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_S_TEXT_UTF8 "S_TEXT/UTF8"
#define MATROSKA_CODEC_ID_S_TEXT_SSA "S_TEXT/SSA"