Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
02dc669f
Commit
02dc669f
authored
May 18, 2007
by
Antoine Cellerier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* ffmpeg/video_filter.c: remove a bunch of trailing spaces.
parent
0b139d49
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
10 deletions
+10
-10
modules/codec/ffmpeg/video_filter.c
modules/codec/ffmpeg/video_filter.c
+10
-10
No files found.
modules/codec/ffmpeg/video_filter.c
View file @
02dc669f
...
@@ -86,7 +86,7 @@ static int OpenFilterEx( vlc_object_t *p_this, vlc_bool_t b_enable_croppadd )
...
@@ -86,7 +86,7 @@ static int OpenFilterEx( vlc_object_t *p_this, vlc_bool_t b_enable_croppadd )
p_filter
->
fmt_in
.
video
.
i_width
!=
p_filter
->
fmt_out
.
video
.
i_width
||
p_filter
->
fmt_in
.
video
.
i_width
!=
p_filter
->
fmt_out
.
video
.
i_width
||
p_filter
->
fmt_in
.
video
.
i_height
!=
p_filter
->
fmt_out
.
video
.
i_height
;
p_filter
->
fmt_in
.
video
.
i_height
!=
p_filter
->
fmt_out
.
video
.
i_height
;
if
(
b_enable_croppadd
)
if
(
b_enable_croppadd
)
{
{
b_resize
=
b_resize
||
b_resize
=
b_resize
||
p_filter
->
fmt_in
.
video
.
i_visible_width
!=
p_filter
->
fmt_in
.
video
.
i_width
||
p_filter
->
fmt_in
.
video
.
i_visible_width
!=
p_filter
->
fmt_in
.
video
.
i_width
||
...
@@ -290,7 +290,7 @@ static int CheckInit( filter_t *p_filter )
...
@@ -290,7 +290,7 @@ static int CheckInit( filter_t *p_filter )
-
p_filter
->
fmt_out
.
video
.
i_x_offset
;
-
p_filter
->
fmt_out
.
video
.
i_x_offset
;
}
}
p_sys
->
p_rsc
=
img_resample_full_init
(
p_sys
->
p_rsc
=
img_resample_full_init
(
p_filter
->
fmt_out
.
video
.
i_width
,
p_filter
->
fmt_out
.
video
.
i_width
,
p_filter
->
fmt_out
.
video
.
i_height
,
p_filter
->
fmt_out
.
video
.
i_height
,
p_filter
->
fmt_in
.
video
.
i_width
,
p_filter
->
fmt_in
.
video
.
i_width
,
...
@@ -342,34 +342,34 @@ static int padcolor[3] = { 16, 128, 128 };
...
@@ -342,34 +342,34 @@ static int padcolor[3] = { 16, 128, 128 };
/* Expects img to be yuv420 */
/* Expects img to be yuv420 */
static
void
fill_pad_region
(
AVPicture
*
img
,
int
height
,
int
width
,
static
void
fill_pad_region
(
AVPicture
*
img
,
int
height
,
int
width
,
int
padtop
,
int
padbottom
,
int
padleft
,
int
padright
,
int
*
color
)
int
padtop
,
int
padbottom
,
int
padleft
,
int
padright
,
int
*
color
)
{
{
int
i
,
y
,
shift
;
int
i
,
y
,
shift
;
uint8_t
*
optr
;
uint8_t
*
optr
;
for
(
i
=
0
;
i
<
3
;
i
++
)
for
(
i
=
0
;
i
<
3
;
i
++
)
{
{
shift
=
(
i
==
0
)
?
0
:
1
;
shift
=
(
i
==
0
)
?
0
:
1
;
if
(
padtop
||
padleft
)
if
(
padtop
||
padleft
)
{
{
memset
(
img
->
data
[
i
],
color
[
i
],
(
(
(
img
->
linesize
[
i
]
*
padtop
)
+
memset
(
img
->
data
[
i
],
color
[
i
],
(
(
(
img
->
linesize
[
i
]
*
padtop
)
+
padleft
)
>>
shift
)
);
padleft
)
>>
shift
)
);
}
}
if
(
padleft
||
padright
)
if
(
padleft
||
padright
)
{
{
optr
=
img
->
data
[
i
]
+
(
img
->
linesize
[
i
]
*
(
padtop
>>
shift
)
)
+
optr
=
img
->
data
[
i
]
+
(
img
->
linesize
[
i
]
*
(
padtop
>>
shift
)
)
+
(
img
->
linesize
[
i
]
-
(
padright
>>
shift
)
);
(
img
->
linesize
[
i
]
-
(
padright
>>
shift
)
);
for
(
y
=
0
;
y
<
(
(
height
-
(
padtop
+
padbottom
)
)
>>
shift
);
y
++
)
for
(
y
=
0
;
y
<
(
(
height
-
(
padtop
+
padbottom
)
)
>>
shift
);
y
++
)
{
{
memset
(
optr
,
color
[
i
],
(
padleft
+
padright
)
>>
shift
);
memset
(
optr
,
color
[
i
],
(
padleft
+
padright
)
>>
shift
);
optr
+=
img
->
linesize
[
i
];
optr
+=
img
->
linesize
[
i
];
}
}
}
}
if
(
padbottom
)
if
(
padbottom
)
{
{
optr
=
img
->
data
[
i
]
+
(
img
->
linesize
[
i
]
*
(
(
height
-
padbottom
)
>>
shift
)
);
optr
=
img
->
data
[
i
]
+
(
img
->
linesize
[
i
]
*
(
(
height
-
padbottom
)
>>
shift
)
);
memset
(
optr
,
color
[
i
],
(
(
img
->
linesize
[
i
]
*
padbottom
)
>>
shift
)
);
memset
(
optr
,
color
[
i
],
(
(
img
->
linesize
[
i
]
*
padbottom
)
>>
shift
)
);
...
@@ -378,7 +378,7 @@ static void fill_pad_region( AVPicture* img, int height, int width,
...
@@ -378,7 +378,7 @@ static void fill_pad_region( AVPicture* img, int height, int width,
}
}
/* Workaround, because old libavcodec doesnt know how to padd */
/* Workaround, because old libavcodec doesnt know how to padd */
static
void
img_resample_padd
(
ImgReSampleContext
*
s
,
AVPicture
*
output
,
static
void
img_resample_padd
(
ImgReSampleContext
*
s
,
AVPicture
*
output
,
const
AVPicture
*
input
,
int
padtop
,
int
padleft
)
const
AVPicture
*
input
,
int
padtop
,
int
padleft
)
{
{
AVPicture
nopadd_pic
=
*
output
;
AVPicture
nopadd_pic
=
*
output
;
...
@@ -503,7 +503,7 @@ static picture_t *Process( filter_t *p_filter, picture_t *p_pic )
...
@@ -503,7 +503,7 @@ static picture_t *Process( filter_t *p_filter, picture_t *p_pic )
p_dst
=
&
dest_pic
;
p_dst
=
&
dest_pic
;
img_resample
(
p_sys
->
p_rsc
,
p_dst
,
p_src
);
img_resample
(
p_sys
->
p_rsc
,
p_dst
,
p_src
);
if
(
p_sys
->
b_enable_croppadd
)
if
(
p_sys
->
b_enable_croppadd
)
{
{
if
(
p_filter
->
fmt_out
.
video
.
i_visible_width
!=
p_filter
->
fmt_out
.
video
.
i_width
||
if
(
p_filter
->
fmt_out
.
video
.
i_visible_width
!=
p_filter
->
fmt_out
.
video
.
i_width
||
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment