Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
68a9c8ac
Commit
68a9c8ac
authored
Aug 26, 2015
by
Timothy Gu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
swscale: Silence an unused variable warning
Also remove a pair of extraneous ifdeffery.
parent
b144008c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
swscale.c
libswscale/swscale.c
+2
-2
No files found.
libswscale/swscale.c
View file @
68a9c8ac
...
@@ -490,12 +490,14 @@ static int swscale(SwsContext *c, const uint8_t *src[],
...
@@ -490,12 +490,14 @@ static int swscale(SwsContext *c, const uint8_t *src[],
for
(;
dstY
<
dstH
;
dstY
++
)
{
for
(;
dstY
<
dstH
;
dstY
++
)
{
const
int
chrDstY
=
dstY
>>
c
->
chrDstVSubSample
;
const
int
chrDstY
=
dstY
>>
c
->
chrDstVSubSample
;
#ifndef NEW_FILTER
uint8_t
*
dest
[
4
]
=
{
uint8_t
*
dest
[
4
]
=
{
dst
[
0
]
+
dstStride
[
0
]
*
dstY
,
dst
[
0
]
+
dstStride
[
0
]
*
dstY
,
dst
[
1
]
+
dstStride
[
1
]
*
chrDstY
,
dst
[
1
]
+
dstStride
[
1
]
*
chrDstY
,
dst
[
2
]
+
dstStride
[
2
]
*
chrDstY
,
dst
[
2
]
+
dstStride
[
2
]
*
chrDstY
,
(
CONFIG_SWSCALE_ALPHA
&&
alpPixBuf
)
?
dst
[
3
]
+
dstStride
[
3
]
*
dstY
:
NULL
,
(
CONFIG_SWSCALE_ALPHA
&&
alpPixBuf
)
?
dst
[
3
]
+
dstStride
[
3
]
*
dstY
:
NULL
,
};
};
#endif
int
use_mmx_vfilter
=
c
->
use_mmx_vfilter
;
int
use_mmx_vfilter
=
c
->
use_mmx_vfilter
;
// First line needed as input
// First line needed as input
...
@@ -747,10 +749,8 @@ static int swscale(SwsContext *c, const uint8_t *src[],
...
@@ -747,10 +749,8 @@ static int swscale(SwsContext *c, const uint8_t *src[],
}
}
}
}
}
else
if
(
yuv2packedX
)
{
}
else
if
(
yuv2packedX
)
{
#ifndef NEW_FILTER
av_assert1
(
lumSrcPtr
+
vLumFilterSize
-
1
<
(
const
int16_t
**
)
lumPixBuf
+
vLumBufSize
*
2
);
av_assert1
(
lumSrcPtr
+
vLumFilterSize
-
1
<
(
const
int16_t
**
)
lumPixBuf
+
vLumBufSize
*
2
);
av_assert1
(
chrUSrcPtr
+
vChrFilterSize
-
1
<
(
const
int16_t
**
)
chrUPixBuf
+
vChrBufSize
*
2
);
av_assert1
(
chrUSrcPtr
+
vChrFilterSize
-
1
<
(
const
int16_t
**
)
chrUPixBuf
+
vChrBufSize
*
2
);
#endif
if
(
c
->
yuv2packed1
&&
vLumFilterSize
==
1
&&
if
(
c
->
yuv2packed1
&&
vLumFilterSize
==
1
&&
vChrFilterSize
<=
2
)
{
// unscaled RGB
vChrFilterSize
<=
2
)
{
// unscaled RGB
int
chrAlpha
=
vChrFilterSize
==
1
?
0
:
vChrFilter
[
2
*
dstY
+
1
];
int
chrAlpha
=
vChrFilterSize
==
1
?
0
:
vChrFilter
[
2
*
dstY
+
1
];
...
...
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