diff options
| author | Stephen Hutchinson <qyot27@gmail.com> | 2013-02-14 07:23:26 -0500 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-03-14 00:07:28 +0100 |
| commit | 1877d7933ec44b392291c3c1ddd220e8dc66758d (patch) | |
| tree | af353473db23d145e042971fb4895c7e3b9f0380 /demux/matroska.h | |
| parent | 21e4f1680c379407d77f0ac976aa8236f8227be0 (diff) | |
| download | mpv-1877d7933ec44b392291c3c1ddd220e8dc66758d.tar.bz2 mpv-1877d7933ec44b392291c3c1ddd220e8dc66758d.tar.xz | |
demux_mkv: Support playing Opus streams in Matroska
FFmpeg recently changed how it writes Opus-in-Matroska to match
the A_OPUS/EXPERIMENTAL name that mkvmerge uses, with the caveat
that things will change and compatibility with old files can get
worked out when the spec is finalized.
This adds both A_OPUS and A_OPUS/EXPERIMENTAL so that *hopefully*
it can play both the newer files that use A_OPUS/EXPERIMENTAL, and
older ones muxed by FFmpeg that were simply A_OPUS, since this is
also what FFmpeg seems to be doing to handle the situation.
Diffstat (limited to 'demux/matroska.h')
| -rw-r--r-- | demux/matroska.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/demux/matroska.h b/demux/matroska.h index 41ccfe2b26..2d424e2a40 100644 --- a/demux/matroska.h +++ b/demux/matroska.h @@ -41,6 +41,8 @@ #define MKV_A_PCM "A_PCM/INT/LIT" #define MKV_A_PCM_BE "A_PCM/INT/BIG" #define MKV_A_VORBIS "A_VORBIS" +#define MKV_A_OPUS "A_OPUS" +#define MKV_A_OPUS_EXP "A_OPUS/EXPERIMENTAL" #define MKV_A_ACM "A_MS/ACM" #define MKV_A_REAL28 "A_REAL/28_8" #define MKV_A_REALATRC "A_REAL/ATRC" |