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
c05065aa
Commit
c05065aa
authored
Mar 26, 2014
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/h261: move b_stride/b_xy under the if() where they are used
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
6795dcfa
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
h261dec.c
libavcodec/h261dec.c
+3
-3
No files found.
libavcodec/h261dec.c
View file @
c05065aa
...
...
@@ -341,8 +341,7 @@ static int h261_decode_block(H261Context *h, int16_t *block, int n, int coded)
static
int
h261_decode_mb
(
H261Context
*
h
)
{
MpegEncContext
*
const
s
=
&
h
->
s
;
int
i
,
cbp
,
xy
,
b_xy
;
int
b_stride
=
2
*
s
->
mb_width
+
1
;
int
i
,
cbp
,
xy
;
cbp
=
63
;
// Read mba
...
...
@@ -375,7 +374,6 @@ static int h261_decode_mb(H261Context *h)
s
->
mb_x
=
((
h
->
gob_number
-
1
)
%
2
)
*
11
+
((
h
->
current_mba
-
1
)
%
11
);
s
->
mb_y
=
((
h
->
gob_number
-
1
)
/
2
)
*
3
+
((
h
->
current_mba
-
1
)
/
11
);
xy
=
s
->
mb_x
+
s
->
mb_y
*
s
->
mb_stride
;
b_xy
=
2
*
s
->
mb_x
+
(
2
*
s
->
mb_y
)
*
b_stride
;
ff_init_block_index
(
s
);
ff_update_block_index
(
s
);
...
...
@@ -435,6 +433,8 @@ static int h261_decode_mb(H261Context *h)
s
->
mv
[
0
][
0
][
1
]
=
h
->
current_mv_y
*
2
;
if
(
s
->
current_picture
.
motion_val
[
0
])
{
int
b_stride
=
2
*
s
->
mb_width
+
1
;
int
b_xy
=
2
*
s
->
mb_x
+
(
2
*
s
->
mb_y
)
*
b_stride
;
s
->
current_picture
.
motion_val
[
0
][
b_xy
][
0
]
=
s
->
mv
[
0
][
0
][
0
];
s
->
current_picture
.
motion_val
[
0
][
b_xy
][
1
]
=
s
->
mv
[
0
][
0
][
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