Commit fe816262 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

WMAPRO is inside FFmpeg now

parent 675bc55b
...@@ -195,6 +195,11 @@ int InitAudioDec( decoder_t *p_dec, AVCodecContext *p_context, ...@@ -195,6 +195,11 @@ int InitAudioDec( decoder_t *p_dec, AVCodecContext *p_context,
case CODEC_ID_FLAC: case CODEC_ID_FLAC:
p_sys->i_output_max = 8 * sizeof(int32_t) * 65535; p_sys->i_output_max = 8 * sizeof(int32_t) * 65535;
break; break;
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 35, 0 )
case CODEC_ID_WMAPRO:
p_sys->i_output_max = 8 * sizeof(float) * 6144; /* (1 << 12) * 3/2 */
break;
#endif
default: default:
p_sys->i_output_max = 0; p_sys->i_output_max = 0;
break; break;
......
...@@ -894,6 +894,13 @@ static const struct ...@@ -894,6 +894,13 @@ static const struct
{ VLC_FOURCC('w','m','a','2'), CODEC_ID_WMAV2, { VLC_FOURCC('w','m','a','2'), CODEC_ID_WMAV2,
AUDIO_ES, "Windows Media Audio 2" }, AUDIO_ES, "Windows Media Audio 2" },
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 35, 0 )
{ VLC_FOURCC('W','M','A','P'), CODEC_ID_WMAPRO,
AUDIO_ES, "Windows Media Audio Professional" },
{ VLC_FOURCC('w','m','a','p'), CODEC_ID_WMAPRO,
AUDIO_ES, "Windows Media Audio Professional" },
#endif
/* DV Audio */ /* DV Audio */
{ VLC_FOURCC('d','v','a','u'), CODEC_ID_DVAUDIO, { VLC_FOURCC('d','v','a','u'), CODEC_ID_DVAUDIO,
AUDIO_ES, "DV Audio" }, AUDIO_ES, "DV 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