Commit f4e53154 authored by Daniel Verkamp's avatar Daniel Verkamp Committed by Jean-Baptiste Kempf
parent 2af32e39
...@@ -143,6 +143,7 @@ ...@@ -143,6 +143,7 @@
#define VLC_CODEC_LCL_MSZH VLC_FOURCC('M','S','Z','H') #define VLC_CODEC_LCL_MSZH VLC_FOURCC('M','S','Z','H')
#define VLC_CODEC_LCL_ZLIB VLC_FOURCC('Z','L','I','B') #define VLC_CODEC_LCL_ZLIB VLC_FOURCC('Z','L','I','B')
#define VLC_CODEC_THP VLC_FOURCC('T','H','P','0') #define VLC_CODEC_THP VLC_FOURCC('T','H','P','0')
#define VLC_CODEC_ESCAPE124 VLC_FOURCC('E','1','2','4')
/* 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')
......
...@@ -168,7 +168,7 @@ static const struct ...@@ -168,7 +168,7 @@ static const struct
{ VLC_CODEC_INDEO5, AV_CODEC_ID_INDEO5, VIDEO_ES }, { VLC_CODEC_INDEO5, AV_CODEC_ID_INDEO5, VIDEO_ES },
{ VLC_CODEC_MIMIC, AV_CODEC_ID_MIMIC, VIDEO_ES }, { VLC_CODEC_MIMIC, AV_CODEC_ID_MIMIC, VIDEO_ES },
/* AV_CODEC_ID_RL2 */ /* AV_CODEC_ID_RL2 */
/* AV_CODEC_ID_ESCAPE124 */ { VLC_CODEC_ESCAPE124, AV_CODEC_ID_ESCAPE124, VIDEO_ES },
{ VLC_CODEC_DIRAC, AV_CODEC_ID_DIRAC, VIDEO_ES }, { VLC_CODEC_DIRAC, AV_CODEC_ID_DIRAC, VIDEO_ES },
/* AV_CODEC_ID_BFI */ /* AV_CODEC_ID_BFI */
/* AV_CODEC_ID_CMV */ /* AV_CODEC_ID_CMV */
......
...@@ -1012,6 +1012,8 @@ static const staticentry_t p_list_video[] = { ...@@ -1012,6 +1012,8 @@ static const staticentry_t p_list_video[] = {
B(VLC_CODEC_TXD, "RenderWare TXD"), B(VLC_CODEC_TXD, "RenderWare TXD"),
B(VLC_CODEC_ESCAPE124, "Escape 124 video"),
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