git.videolan.org
/
vlc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c0653a1
)
also scale I420/YV12. (untested) (btw, why don't we use the "normal" scaling modules...
author
Antoine Cellerier
<dionoea@videolan.org>
Mon, 2 Apr 2007 16:24:23 +0000
(16:24 +0000)
committer
Antoine Cellerier
<dionoea@videolan.org>
Mon, 2 Apr 2007 16:24:23 +0000
(16:24 +0000)
modules/video_filter/scale.c
patch
|
blob
|
history
diff --git
a/modules/video_filter/scale.c
b/modules/video_filter/scale.c
index
388ce69
..
7cb40e6
100644
(file)
--- a/
modules/video_filter/scale.c
+++ b/
modules/video_filter/scale.c
@@
-67,6
+67,8
@@
static int OpenFilter( vlc_object_t *p_this )
if( ( p_filter->fmt_in.video.i_chroma != VLC_FOURCC('Y','U','V','P') &&
p_filter->fmt_in.video.i_chroma != VLC_FOURCC('Y','U','V','A') &&
if( ( p_filter->fmt_in.video.i_chroma != VLC_FOURCC('Y','U','V','P') &&
p_filter->fmt_in.video.i_chroma != VLC_FOURCC('Y','U','V','A') &&
+ p_filter->fmt_in.video.i_chroma != VLC_FOURCC('I','4','2','0') &&
+ p_filter->fmt_in.video.i_chroma != VLC_FOURCC('Y','V','1','2') &&
p_filter->fmt_in.video.i_chroma != VLC_FOURCC('R','G','B','A') ) ||
p_filter->fmt_in.video.i_chroma != p_filter->fmt_out.video.i_chroma )
{
p_filter->fmt_in.video.i_chroma != VLC_FOURCC('R','G','B','A') ) ||
p_filter->fmt_in.video.i_chroma != p_filter->fmt_out.video.i_chroma )
{
@@
-121,8
+123,7
@@
static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
return NULL;
}
return NULL;
}
- if( p_filter->fmt_in.video.i_chroma == VLC_FOURCC('Y','U','V','P') ||
- p_filter->fmt_in.video.i_chroma == VLC_FOURCC('Y','U','V','A') )
+ if( p_filter->fmt_in.video.i_chroma != VLC_FOURCC('R','G','B','A') )
{
for( i_plane = 0; i_plane < p_pic_dst->i_planes; i_plane++ )
{
{
for( i_plane = 0; i_plane < p_pic_dst->i_planes; i_plane++ )
{