[vlc-commits] dshow: add mapping for H264 subtypes

[Dmitry Buzdyk]

vlc | branch: master | Dmitry Buzdyk <dima.buzdyk at gmail.com> | Mon Feb 17 16:49:13 2020 +0100| [0c66be6e99a517fc7a4f167027ba33703919a677] | committer: Steve Lhomme

dshow: add mapping for H264 subtypes

Map H264 subtypes containing H264 bitstream in Annex B format to VLC_CODEC_H264
https://docs.microsoft.com/en-us/windows/win32/directshow/h-264-video-types

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0c66be6e99a517fc7a4f167027ba33703919a677
---

 modules/access/dshow/filter.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/access/dshow/filter.cpp b/modules/access/dshow/filter.cpp
index 0c23e50a5e..562c7af9d4 100644
--- a/modules/access/dshow/filter.cpp
+++ b/modules/access/dshow/filter.cpp
@@ -178,6 +178,11 @@ int GetFourCCFromMediaType( const AM_MEDIA_TYPE &media_type )
             else if( media_type.subtype == MEDIASUBTYPE_MJPG )
                 i_fourcc = VLC_CODEC_MJPG;
 
+            else if( media_type.subtype == MEDIASUBTYPE_H264 ||
+                     media_type.subtype == MEDIASUBTYPE_h264 ||
+                     media_type.subtype == MEDIASUBTYPE_x264 ||
+                     media_type.subtype == MEDIASUBTYPE_X264 )
+                i_fourcc = VLC_CODEC_H264;
         }
     }
     else if( media_type.majortype == MEDIATYPE_Audio )