Commit 19092b04 authored by Daniel Verkamp's avatar Daniel Verkamp Committed by Jean-Baptiste Kempf
parent ea4c47e7
...@@ -140,6 +140,8 @@ ...@@ -140,6 +140,8 @@
#define VLC_CODEC_BINKAUDIO_DCT VLC_FOURCC('B','A','U','1') #define VLC_CODEC_BINKAUDIO_DCT VLC_FOURCC('B','A','U','1')
#define VLC_CODEC_BINKAUDIO_RDFT VLC_FOURCC('B','A','U','2') #define VLC_CODEC_BINKAUDIO_RDFT VLC_FOURCC('B','A','U','2')
#define VLC_CODEC_XAN_WC4 VLC_FOURCC('X','x','a','n') #define VLC_CODEC_XAN_WC4 VLC_FOURCC('X','x','a','n')
#define VLC_CODEC_LCL_MSZH VLC_FOURCC('M','S','Z','H')
#define VLC_CODEC_LCL_ZLIB VLC_FOURCC('Z','L','I','B')
/* Planar YUV 4:1:0 Y:V:U */ /* Planar YUV 4:1:0 Y:V:U */
#define VLC_CODEC_YV9 VLC_FOURCC('Y','V','U','9') #define VLC_CODEC_YV9 VLC_FOURCC('Y','V','U','9')
......
...@@ -104,8 +104,8 @@ static const struct ...@@ -104,8 +104,8 @@ static const struct
{ VLC_CODEC_FLIC, AV_CODEC_ID_FLIC, VIDEO_ES }, { VLC_CODEC_FLIC, AV_CODEC_ID_FLIC, VIDEO_ES },
{ VLC_CODEC_TRUEMOTION1, AV_CODEC_ID_TRUEMOTION1, VIDEO_ES }, { VLC_CODEC_TRUEMOTION1, AV_CODEC_ID_TRUEMOTION1, VIDEO_ES },
{ VLC_CODEC_VMDVIDEO, AV_CODEC_ID_VMDVIDEO, VIDEO_ES }, { VLC_CODEC_VMDVIDEO, AV_CODEC_ID_VMDVIDEO, VIDEO_ES },
/* AV_CODEC_ID_MSZH */ { VLC_CODEC_LCL_MSZH, AV_CODEC_ID_MSZH, VIDEO_ES },
/* AV_CODEC_ID_ZLIB */ { VLC_CODEC_LCL_ZLIB, AV_CODEC_ID_ZLIB, VIDEO_ES },
{ VLC_CODEC_QTRLE, AV_CODEC_ID_QTRLE, VIDEO_ES }, { VLC_CODEC_QTRLE, AV_CODEC_ID_QTRLE, VIDEO_ES },
{ VLC_CODEC_TSCC, AV_CODEC_ID_TSCC, VIDEO_ES }, { VLC_CODEC_TSCC, AV_CODEC_ID_TSCC, VIDEO_ES },
{ VLC_CODEC_ULTI, AV_CODEC_ID_ULTI, VIDEO_ES }, { VLC_CODEC_ULTI, AV_CODEC_ID_ULTI, VIDEO_ES },
......
...@@ -1002,6 +1002,12 @@ static const staticentry_t p_list_video[] = { ...@@ -1002,6 +1002,12 @@ static const staticentry_t p_list_video[] = {
B(VLC_CODEC_XAN_WC4, "Wing Commander IV Xan video"), B(VLC_CODEC_XAN_WC4, "Wing Commander IV Xan video"),
A("Xxan"), A("Xxan"),
B(VLC_CODEC_LCL_MSZH, "Loss-Less Codec Library AVImszh"),
A("MSZH"),
B(VLC_CODEC_LCL_ZLIB, "Loss-Less Codec Library AVIzlib"),
A("ZLIB"),
B(0, "") B(0, "")
}; };
static const staticentry_t p_list_audio[] = { static const staticentry_t p_list_audio[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment