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
111e9b09
Commit
111e9b09
authored
Mar 24, 2019
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/ivi: fix indention for previous commit
parent
c163e62d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
28 additions
and
28 deletions
+28
-28
ivi.c
libavcodec/ivi.c
+28
-28
No files found.
libavcodec/ivi.c
View file @
111e9b09
...
...
@@ -807,36 +807,36 @@ static int ivi_process_empty_tile(AVCodecContext *avctx, IVIBandDesc *band,
}
if
(
ref_mb
)
{
if
(
band
->
inherit_qdelta
)
mb
->
q_delta
=
ref_mb
->
q_delta
;
if
(
band
->
inherit_mv
)
{
/* motion vector inheritance */
if
(
mv_scale
)
{
mb
->
mv_x
=
ivi_scale_mv
(
ref_mb
->
mv_x
,
mv_scale
);
mb
->
mv_y
=
ivi_scale_mv
(
ref_mb
->
mv_y
,
mv_scale
);
}
else
{
mb
->
mv_x
=
ref_mb
->
mv_x
;
mb
->
mv_y
=
ref_mb
->
mv_y
;
}
need_mc
|=
mb
->
mv_x
||
mb
->
mv_y
;
/* tracking non-zero motion vectors */
{
int
dmv_x
,
dmv_y
,
cx
,
cy
;
dmv_x
=
mb
->
mv_x
>>
band
->
is_halfpel
;
dmv_y
=
mb
->
mv_y
>>
band
->
is_halfpel
;
cx
=
mb
->
mv_x
&
band
->
is_halfpel
;
cy
=
mb
->
mv_y
&
band
->
is_halfpel
;
if
(
mb
->
xpos
+
dmv_x
<
0
||
mb
->
xpos
+
dmv_x
+
band
->
mb_size
+
cx
>
band
->
pitch
||
mb
->
ypos
+
dmv_y
<
0
||
mb
->
ypos
+
dmv_y
+
band
->
mb_size
+
cy
>
band
->
aheight
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"MV out of bounds
\n
"
);
return
AVERROR_INVALIDDATA
;
if
(
band
->
inherit_qdelta
)
mb
->
q_delta
=
ref_mb
->
q_delta
;
if
(
band
->
inherit_mv
)
{
/* motion vector inheritance */
if
(
mv_scale
)
{
mb
->
mv_x
=
ivi_scale_mv
(
ref_mb
->
mv_x
,
mv_scale
);
mb
->
mv_y
=
ivi_scale_mv
(
ref_mb
->
mv_y
,
mv_scale
);
}
else
{
mb
->
mv_x
=
ref_mb
->
mv_x
;
mb
->
mv_y
=
ref_mb
->
mv_y
;
}
need_mc
|=
mb
->
mv_x
||
mb
->
mv_y
;
/* tracking non-zero motion vectors */
{
int
dmv_x
,
dmv_y
,
cx
,
cy
;
dmv_x
=
mb
->
mv_x
>>
band
->
is_halfpel
;
dmv_y
=
mb
->
mv_y
>>
band
->
is_halfpel
;
cx
=
mb
->
mv_x
&
band
->
is_halfpel
;
cy
=
mb
->
mv_y
&
band
->
is_halfpel
;
if
(
mb
->
xpos
+
dmv_x
<
0
||
mb
->
xpos
+
dmv_x
+
band
->
mb_size
+
cx
>
band
->
pitch
||
mb
->
ypos
+
dmv_y
<
0
||
mb
->
ypos
+
dmv_y
+
band
->
mb_size
+
cy
>
band
->
aheight
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"MV out of bounds
\n
"
);
return
AVERROR_INVALIDDATA
;
}
}
}
}
ref_mb
++
;
}
...
...
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