Commit 4fc4b04c authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

FFMPEG FOURCC's: add FOURCC for DNxHD and compile fix for different versions.

parent 53422c23
...@@ -1074,9 +1074,6 @@ static struct ...@@ -1074,9 +1074,6 @@ static struct
{ VLC_FOURCC('s','n','o','w'), CODEC_ID_SNOW, { VLC_FOURCC('s','n','o','w'), CODEC_ID_SNOW,
VIDEO_ES, "FFMpeg SNOW wavelet Video" }, VIDEO_ES, "FFMpeg SNOW wavelet Video" },
{ VLC_FOURCC('r','l','e',' '), CODEC_ID_QTRLE, { VLC_FOURCC('r','l','e',' '), CODEC_ID_QTRLE,
VIDEO_ES, "Apple QuickTime RLE Video" }, VIDEO_ES, "Apple QuickTime RLE Video" },
...@@ -1141,6 +1138,14 @@ static struct ...@@ -1141,6 +1138,14 @@ static struct
VIDEO_ES, "Chinese AVS" }, VIDEO_ES, "Chinese AVS" },
#endif #endif
#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(40<<8)+0)
/* Untested yet */
{ VLC_FOURCC('A','V','D','n'), CODEC_ID_DNXHD,
VIDEO_ES, "DNxHD" },
#endif
{ VLC_FOURCC('8','B','P','S'), CODEC_ID_8BPS,
VIDEO_ES, "8BPS" },
/* Videogames Codecs */ /* Videogames Codecs */
/* Interplay MVE */ /* Interplay MVE */
...@@ -1313,9 +1318,11 @@ static struct ...@@ -1313,9 +1318,11 @@ static struct
{ VLC_FOURCC('R','o','Q','a'), CODEC_ID_ROQ_DPCM, { VLC_FOURCC('R','o','Q','a'), CODEC_ID_ROQ_DPCM,
AUDIO_ES, "Id RoQ DPCM Audio" }, AUDIO_ES, "Id RoQ DPCM Audio" },
#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(27<<8)+0)
/* DCIN Audio */ /* DCIN Audio */
{ VLC_FOURCC('D','C','I','A'), CODEC_ID_DSICINAUDIO, { VLC_FOURCC('D','C','I','A'), CODEC_ID_DSICINAUDIO,
AUDIO_ES, "Delphine CIN Audio" }, AUDIO_ES, "Delphine CIN Audio" },
#endif
/* Sony Playstation XA ADPCM */ /* Sony Playstation XA ADPCM */
{ VLC_FOURCC('x','a',' ',' '), CODEC_ID_ADPCM_XA, { VLC_FOURCC('x','a',' ',' '), CODEC_ID_ADPCM_XA,
...@@ -1401,9 +1408,10 @@ static struct ...@@ -1401,9 +1408,10 @@ static struct
{ VLC_FOURCC('S','O','N','C'), CODEC_ID_SONIC, { VLC_FOURCC('S','O','N','C'), CODEC_ID_SONIC,
AUDIO_ES, "Sonic" }, AUDIO_ES, "Sonic" },
#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(34<<8)+0)
{ VLC_FOURCC(0x1,0x4,0x0,0x0), CODEC_ID_IMC, { VLC_FOURCC(0x1,0x4,0x0,0x0), CODEC_ID_IMC,
AUDIO_ES, "IMC" }, AUDIO_ES, "IMC" },
#endif
{ VLC_FOURCC(0x22,0x0,0x0,0x0), CODEC_ID_TRUESPEECH, { VLC_FOURCC(0x22,0x0,0x0,0x0), CODEC_ID_TRUESPEECH,
AUDIO_ES, "TrueSpeech" }, AUDIO_ES, "TrueSpeech" },
......
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