Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
b96f0ab3
Commit
b96f0ab3
authored
Jul 30, 2016
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
h264: Kill broken disabled cruft
parent
42c4c2d2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
40 deletions
+0
-40
h264_ps.c
libavcodec/h264_ps.c
+0
-31
h264_refs.c
libavcodec/h264_refs.c
+0
-9
No files found.
libavcodec/h264_ps.c
View file @
b96f0ab3
...
...
@@ -713,37 +713,6 @@ int ff_h264_decode_picture_parameter_set(GetBitContext *gb, AVCodecContext *avct
if
(
pps
->
slice_group_count
>
1
)
{
pps
->
mb_slice_group_map_type
=
get_ue_golomb
(
gb
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"FMO not supported
\n
"
);
switch
(
pps
->
mb_slice_group_map_type
)
{
case
0
:
#if 0
| for (i = 0; i <= num_slice_groups_minus1; i++) | | |
| run_length[i] |1 |ue(v) |
#endif
break
;
case
2
:
#if 0
| for (i = 0; i < num_slice_groups_minus1; i++) { | | |
| top_left_mb[i] |1 |ue(v) |
| bottom_right_mb[i] |1 |ue(v) |
| } | | |
#endif
break
;
case
3
:
case
4
:
case
5
:
#if 0
| slice_group_change_direction_flag |1 |u(1) |
| slice_group_change_rate_minus1 |1 |ue(v) |
#endif
break
;
case
6
:
#if 0
| slice_group_id_cnt_minus1 |1 |ue(v) |
| for (i = 0; i <= slice_group_id_cnt_minus1; i++)| | |
| slice_group_id[i] |1 |u(v) |
#endif
break
;
}
}
pps
->
ref_count
[
0
]
=
get_ue_golomb
(
gb
)
+
1
;
pps
->
ref_count
[
1
]
=
get_ue_golomb
(
gb
)
+
1
;
...
...
libavcodec/h264_refs.c
View file @
b96f0ab3
...
...
@@ -754,15 +754,6 @@ int ff_h264_decode_ref_pic_marking(H264SliceContext *sl, GetBitContext *gb,
mmco
[
i
].
short_pic_num
=
(
sl
->
curr_pic_num
-
get_ue_golomb
(
gb
)
-
1
)
&
(
sl
->
max_pic_num
-
1
);
#if 0
if (mmco[i].short_pic_num >= h->short_ref_count ||
!h->short_ref[mmco[i].short_pic_num]) {
av_log(s->avctx, AV_LOG_ERROR,
"illegal short ref in memory management control "
"operation %d\n", mmco);
return -1;
}
#endif
}
if
(
opcode
==
MMCO_SHORT2LONG
||
opcode
==
MMCO_LONG2UNUSED
||
opcode
==
MMCO_LONG
||
opcode
==
MMCO_SET_MAX_LONG
)
{
...
...
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