Commit d6ed3af1 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* Update wavpack libavcodec version for trunk as well. fixes #828

parent da7262d7
...@@ -1108,6 +1108,11 @@ static struct ...@@ -1108,6 +1108,11 @@ static struct
AUDIO_ES, "Shorten Lossless Audio" }, AUDIO_ES, "Shorten Lossless Audio" },
#endif #endif
#if LIBAVCODEC_BUILD >= ((51<<16)+(16<<8)+0)
{ VLC_FOURCC('w','v','p','k'), CODEC_ID_WAVPACK,
AUDIO_ES, "WavPack" },
#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" },
...@@ -1142,11 +1147,6 @@ static struct ...@@ -1142,11 +1147,6 @@ static struct
{ VLC_FOURCC('u','l','a','w'), CODEC_ID_PCM_MULAW, { VLC_FOURCC('u','l','a','w'), CODEC_ID_PCM_MULAW,
AUDIO_ES, "PCM ULAW" }, AUDIO_ES, "PCM ULAW" },
#if LIBAVCODEC_BUILD >= ((51<<16)+(15<<8)+1)
{ VLC_FOURCC('w','v','p','k'), CODEC_ID_WAVPACK,
AUDIO_ES, "WavPack" },
#endif
{ 0, 0, 0, 0 } { 0, 0, 0, 0 }
}; };
......
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