Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
17a63ff0
Commit
17a63ff0
authored
Feb 19, 2014
by
Vittorio Giovara
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
h264: update flag name in ff_h264_decode_ref_pic_list_reordering()
This is the name used in the specifications.
parent
ee6280ca
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
6 deletions
+7
-6
h264_refs.c
libavcodec/h264_refs.c
+7
-6
No files found.
libavcodec/h264_refs.c
View file @
17a63ff0
...
@@ -220,16 +220,16 @@ int ff_h264_decode_ref_pic_list_reordering(H264Context *h)
...
@@ -220,16 +220,16 @@ int ff_h264_decode_ref_pic_list_reordering(H264Context *h)
for
(
i
=
0
;
i
<
h
->
ref_count
[
list
];
i
++
)
for
(
i
=
0
;
i
<
h
->
ref_count
[
list
];
i
++
)
COPY_PICTURE
(
&
h
->
ref_list
[
list
][
i
],
&
h
->
default_ref_list
[
list
][
i
]);
COPY_PICTURE
(
&
h
->
ref_list
[
list
][
i
],
&
h
->
default_ref_list
[
list
][
i
]);
if
(
get_bits1
(
&
h
->
gb
))
{
if
(
get_bits1
(
&
h
->
gb
))
{
// ref_pic_list_modification_flag_l[01]
int
pred
=
h
->
curr_pic_num
;
int
pred
=
h
->
curr_pic_num
;
for
(
index
=
0
;
;
index
++
)
{
for
(
index
=
0
;
;
index
++
)
{
unsigned
int
reordering
_of_pic_nums_idc
=
get_ue_golomb_31
(
&
h
->
gb
);
unsigned
int
modification
_of_pic_nums_idc
=
get_ue_golomb_31
(
&
h
->
gb
);
unsigned
int
pic_id
;
unsigned
int
pic_id
;
int
i
;
int
i
;
Picture
*
ref
=
NULL
;
Picture
*
ref
=
NULL
;
if
(
reordering
_of_pic_nums_idc
==
3
)
if
(
modification
_of_pic_nums_idc
==
3
)
break
;
break
;
if
(
index
>=
h
->
ref_count
[
list
])
{
if
(
index
>=
h
->
ref_count
[
list
])
{
...
@@ -237,7 +237,7 @@ int ff_h264_decode_ref_pic_list_reordering(H264Context *h)
...
@@ -237,7 +237,7 @@ int ff_h264_decode_ref_pic_list_reordering(H264Context *h)
return
-
1
;
return
-
1
;
}
}
switch
(
reordering
_of_pic_nums_idc
)
{
switch
(
modification
_of_pic_nums_idc
)
{
case
0
:
case
0
:
case
1
:
{
case
1
:
{
const
unsigned
int
abs_diff_pic_num
=
get_ue_golomb
(
&
h
->
gb
)
+
1
;
const
unsigned
int
abs_diff_pic_num
=
get_ue_golomb
(
&
h
->
gb
)
+
1
;
...
@@ -249,7 +249,7 @@ int ff_h264_decode_ref_pic_list_reordering(H264Context *h)
...
@@ -249,7 +249,7 @@ int ff_h264_decode_ref_pic_list_reordering(H264Context *h)
return
AVERROR_INVALIDDATA
;
return
AVERROR_INVALIDDATA
;
}
}
if
(
reordering
_of_pic_nums_idc
==
0
)
if
(
modification
_of_pic_nums_idc
==
0
)
pred
-=
abs_diff_pic_num
;
pred
-=
abs_diff_pic_num
;
else
else
pred
+=
abs_diff_pic_num
;
pred
+=
abs_diff_pic_num
;
...
@@ -293,7 +293,8 @@ int ff_h264_decode_ref_pic_list_reordering(H264Context *h)
...
@@ -293,7 +293,8 @@ int ff_h264_decode_ref_pic_list_reordering(H264Context *h)
}
}
default:
default:
av_log
(
h
->
avctx
,
AV_LOG_ERROR
,
av_log
(
h
->
avctx
,
AV_LOG_ERROR
,
"illegal reordering_of_pic_nums_idc
\n
"
);
"illegal modification_of_pic_nums_idc %u
\n
"
,
modification_of_pic_nums_idc
);
return
AVERROR_INVALIDDATA
;
return
AVERROR_INVALIDDATA
;
}
}
...
...
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