diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp index dd0a48db84..8c848816b8 100644 --- a/modules/access/dshow/dshow.cpp +++ b/modules/access/dshow/dshow.cpp @@ -626,12 +626,6 @@ static void SetRGBMasks( vlc_fourcc_t i_fourcc, video_format_t *fmt ) { switch( i_fourcc ) { - case VLC_CODEC_RGB24M: - /* This is in BGR format */ - fmt->i_bmask = 0x00ff0000; - fmt->i_gmask = 0x0000ff00; - fmt->i_rmask = 0x000000ff; - break; default: return; } @@ -940,7 +934,7 @@ static int GetFourCCPriority( vlc_fourcc_t i_fourcc ) case VLC_CODEC_YV12: case VLC_FOURCC('a','r','a','w'): return 8; - case VLC_CODEC_RGB24M: + case VLC_CODEC_BGR24: return 7; case VLC_CODEC_YUYV: case VLC_CODEC_BGRX: diff --git a/modules/access/dshow/filter.cpp b/modules/access/dshow/filter.cpp index 755f1c9f28..b62dc0c232 100644 --- a/modules/access/dshow/filter.cpp +++ b/modules/access/dshow/filter.cpp @@ -116,7 +116,7 @@ vlc_fourcc_t GetFourCCFromMediaType( const AM_MEDIA_TYPE &media_type ) else if( media_type.subtype == MEDIASUBTYPE_RGB565 ) i_fourcc = VLC_CODEC_RGB16; else if( media_type.subtype == MEDIASUBTYPE_RGB24 ) - i_fourcc = VLC_CODEC_RGB24M; + i_fourcc = VLC_CODEC_BGR24; else if( media_type.subtype == MEDIASUBTYPE_RGB32 ) i_fourcc = VLC_CODEC_BGRX; else if( media_type.subtype == MEDIASUBTYPE_ARGB32 )