summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-12-09 02:50:17 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-12-09 02:50:17 +0200
commitcc2d748b73c0147c11089d63e4ff9836070a09a8 (patch)
tree6062375e90a7cc23818a969d6aeff199d801547a /libmpdemux/demuxer.c
parent102b240e96ea2d5a675958d8365f2feb301a7498 (diff)
downloadmpv-cc2d748b73c0147c11089d63e4ff9836070a09a8.tar.bz2
mpv-cc2d748b73c0147c11089d63e4ff9836070a09a8.tar.xz
audio: FLAC: support new libavcodec parser, use lavf to demux
Parse FLAC data with new libavcodec parser if needed. Use libavformat demuxer for raw FLAC files by default.
Diffstat (limited to 'libmpdemux/demuxer.c')
-rw-r--r--libmpdemux/demuxer.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 51343f1595..af7f40c004 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -464,6 +464,9 @@ static void allocate_parser(AVCodecContext **avctx, AVCodecParserContext **parse
case 0x86:
codec_id = CODEC_ID_DTS;
break;
+ case MKTAG('f', 'L', 'a', 'C'):
+ codec_id = CODEC_ID_FLAC;
+ break;
case MKTAG('M', 'L', 'P', ' '):
codec_id = CODEC_ID_MLP;
break;