Skip to content

V
vlc
Commit badbbbc9 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

* Add proper ffmpeg version check for wavpack to trunk

parent aefa7bb5
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 3 deletions
modules/codec/ffmpeg/ffmpeg.c
View file @ badbbbc9
...@@ -1092,9 +1092,6 @@ static struct ...@@ -1092,9 +1092,6 @@ static struct
#endif #endif
#if LIBAVCODEC_BUILD >= ((51<<16)+(4<<8)+0) #if LIBAVCODEC_BUILD >= ((51<<16)+(4<<8)+0)
/* WavPack */
{ VLC_FOURCC('W','V','P','K'), CODEC_ID_WAVPACK,
AUDIO_ES, "WavPack Lossless Audio" },
/* TTA: The Lossless True Audio */ /* TTA: The Lossless True Audio */
{ VLC_FOURCC('T','T','A','1'), CODEC_ID_TTA, { VLC_FOURCC('T','T','A','1'), CODEC_ID_TTA,
AUDIO_ES, "The Lossless True Audio" }, AUDIO_ES, "The Lossless True Audio" },
...@@ -1106,6 +1103,12 @@ static struct ...@@ -1106,6 +1103,12 @@ static struct
AUDIO_ES, "Shorten Lossless Audio" }, AUDIO_ES, "Shorten Lossless Audio" },
#endif #endif
#if LIBAVCODEC_BUILD >= ((51<<16)+(16<<8)+0)
/* WavPack */
{ VLC_FOURCC('W','V','P','K'), CODEC_ID_WAVPACK,
AUDIO_ES, "WavPack Lossless Audio" },
#endif
/* PCM */ /* PCM */
{ VLC_FOURCC('s','8',' ',' '), CODEC_ID_PCM_S8, { VLC_FOURCC('s','8',' ',' '), CODEC_ID_PCM_S8,
AUDIO_ES, "PCM S8" }, AUDIO_ES, "PCM S8" },
......
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