Merge branch 'dfpwm-support' into 'master'

avcodec: Add DFPWM reading support

See merge request videolan/vlc!2066

include/vlc_fourcc.h

@@ -641,6 +641,7 @@
 #define VLC_CODEC_DSD_LSBF_PLANAR            VLC_FOURCC('D','S','F','l')
 #define VLC_CODEC_DSD_MSBF                   VLC_FOURCC('D','S','D',' ')
 #define VLC_CODEC_DSD_MSBF_PLANAR            VLC_FOURCC('D','S','F','m')
+#define VLC_CODEC_DFPWM                      VLC_FOURCC('D','F','P','W')
 
 /* Subtitle */
 #define VLC_CODEC_SPU       VLC_FOURCC('s','p','u',' ')

modules/codec/avcodec/fourcc.c

@@ -512,6 +512,9 @@ static const struct vlc_avcodec_fourcc audio_codecs[] =
     { VLC_CODEC_METASOUND, AV_CODEC_ID_METASOUND },
     /* AV_CODEC_ID_PAF_AUDIO */
     { VLC_CODEC_ON2AVC, AV_CODEC_ID_ON2AVC },
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 59, 22, 100 )
+    { VLC_CODEC_DFPWM, AV_CODEC_ID_DFPWM },
+#endif
 
     /* DSD */
     { VLC_CODEC_DSD_LSBF, AV_CODEC_ID_DSD_LSBF },

src/misc/fourcc_list.h

@@ -1729,6 +1729,8 @@ static const staticentry_t p_list_audio[] = {
     B(VLC_CODEC_DSD_LSBF_PLANAR, "DSD (Direct Stream Digital) LSB first, planar"),
 
     B(VLC_CODEC_DSD_MSBF_PLANAR, "DSD (Direct Stream Digital) MSB first, planar"),
+
+    B(VLC_CODEC_DFPWM, "DFPWM1a audio"),
 };
 
 static const staticentry_t p_list_spu[] = {