diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-10-27 01:46:05 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-10-27 01:46:05 +0300 |
| commit | d9e328160834c6b28ba29b0ccf0653a14f2cf606 (patch) | |
| tree | 8bbfca4e11a0df41ae8caf61bcceb936c998e06e /libmpdemux | |
| parent | dd61521a6ebe73ac8060974c43ac4a6d8fda2e25 (diff) | |
| download | mpv-d9e328160834c6b28ba29b0ccf0653a14f2cf606.tar.bz2 mpv-d9e328160834c6b28ba29b0ccf0653a14f2cf606.tar.xz | |
demux_mkv: support V_MJPEG video tag
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_mkv.c | 1 | ||||
| -rw-r--r-- | libmpdemux/matroska.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index c9d8312e61..589acc8695 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -1153,6 +1153,7 @@ typedef struct { } videocodec_info_t; static const videocodec_info_t vinfo[] = { + {MKV_V_MJPEG, mmioFOURCC('m', 'j', 'p', 'g'), 1}, {MKV_V_MPEG1, mmioFOURCC('m', 'p', 'g', '1'), 0}, {MKV_V_MPEG2, mmioFOURCC('m', 'p', 'g', '2'), 0}, {MKV_V_MPEG4_SP, mmioFOURCC('m', 'p', '4', 'v'), 1}, diff --git a/libmpdemux/matroska.h b/libmpdemux/matroska.h index c8c289d060..332f934f9c 100644 --- a/libmpdemux/matroska.h +++ b/libmpdemux/matroska.h @@ -70,6 +70,7 @@ #define MKV_V_MPEG4_AVC "V_MPEG4/ISO/AVC" #define MKV_V_THEORA "V_THEORA" #define MKV_V_VP8 "V_VP8" +#define MKV_V_MJPEG "V_MJPEG" #define MKV_S_TEXTASCII "S_TEXT/ASCII" #define MKV_S_TEXTUTF8 "S_TEXT/UTF8" |