diff options
| author | Uoti Urpala <uau@mplayer2.org> | 2011-05-02 00:46:03 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2011-05-02 00:46:03 +0300 |
| commit | 7e65428712beacd416dc3410c52f22ebfd3b4c53 (patch) | |
| tree | 79bb2f4388be7031b5505c7745e1a59aff6cff56 /libmpdemux/demuxer.c | |
| parent | 5c4b059f1608f6d6a981b7d81a14f1c46e40ba52 (diff) | |
| parent | d0376729d171a6c0b4cc15928c168f68adefbaa6 (diff) | |
| download | mpv-7e65428712beacd416dc3410c52f22ebfd3b4c53.tar.bz2 mpv-7e65428712beacd416dc3410c52f22ebfd3b4c53.tar.xz | |
Merge branch 'mplayer1_changes'
Diffstat (limited to 'libmpdemux/demuxer.c')
| -rw-r--r-- | libmpdemux/demuxer.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index a4cee9b8ea..d441ac2863 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -516,10 +516,13 @@ static void allocate_parser(AVCodecContext **avctx, AVCodecParserContext **parse case 0x332D6361: case 0x332D4341: case 0x20736D: - case MKTAG('d', 'n', 'e', 't'): case MKTAG('s', 'a', 'c', '3'): codec_id = CODEC_ID_AC3; break; + case MKTAG('d', 'n', 'e', 't'): + // DNET/byte-swapped AC-3 - there is no parser for that yet + //codec_id = CODEC_ID_DNET; + break; case MKTAG('E', 'A', 'C', '3'): codec_id = CODEC_ID_EAC3; break; |