Skip to content

V
vlc-2-2
Commit b1dd2eb4 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Fixed raw video maks in avi.

parent 033efbad
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 10 deletions
modules/demux/avi/avi.c
View file @ b1dd2eb4
...@@ -510,27 +510,34 @@ static int Open( vlc_object_t * p_this ) ...@@ -510,27 +510,34 @@ static int Open( vlc_object_t * p_this )
case 24: case 24:
tk->i_codec = VLC_FOURCC('R','V','2','4'); tk->i_codec = VLC_FOURCC('R','V','2','4');
break; break;
case 16: case 16: /* Yes it is RV15 */
/* tk->i_codec = VLC_FOURCC('R','V','1','6');*/
/* break;*/
case 15: case 15:
tk->i_codec = VLC_FOURCC('R','V','1','5'); tk->i_codec = VLC_FOURCC('R','V','1','5');
break; break;
case 9: case 9: /* <- TODO check that */
tk->i_codec = VLC_FOURCC( 'Y', 'V', 'U', '9' ); /* <- TODO check that */ tk->i_codec = VLC_FOURCC( 'Y', 'V', 'U', '9' );
break; break;
case 8: case 8: /* <- TODO check that */
tk->i_codec = VLC_FOURCC('Y','8','0','0'); tk->i_codec = VLC_FOURCC('Y','8','0','0');
break; break;
} }
es_format_Init( &fmt, VIDEO_ES, tk->i_codec ); es_format_Init( &fmt, VIDEO_ES, tk->i_codec );
if( p_vids->p_bih->biBitCount == 24 ) switch( tk->i_codec )
{ {
/* This is in BGR format */ case VLC_FOURCC('R','V','2','4'):
fmt.video.i_bmask = 0x00ff0000; case VLC_FOURCC('R','V','3','2'):
fmt.video.i_rmask = 0x00ff0000;
fmt.video.i_gmask = 0x0000ff00; fmt.video.i_gmask = 0x0000ff00;
fmt.video.i_rmask = 0x000000ff; fmt.video.i_bmask = 0x000000ff;
break;
case VLC_FOURCC('R','V','1','5'):
fmt.video.i_rmask = 0x7c00;
fmt.video.i_gmask = 0x03e0;
fmt.video.i_bmask = 0x001f;
break;
default:
break;
} }
} }
else else
......
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