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
0782fb6b
Commit
0782fb6b
authored
Jul 31, 2014
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
libavcodec/h264_parser: Increase parse_history, fix huge resolutions
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
bf428bb3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
h264.h
libavcodec/h264.h
+1
-1
h264_parser.c
libavcodec/h264_parser.c
+2
-2
No files found.
libavcodec/h264.h
View file @
0782fb6b
...
...
@@ -749,7 +749,7 @@ typedef struct H264Context {
int16_t
slice_row
[
MAX_SLICES
];
///< to detect when MAX_SLICES is too low
uint8_t
parse_history
[
4
];
uint8_t
parse_history
[
6
];
int
parse_history_count
;
int
parse_last_mb
;
uint8_t
*
edge_emu_buffer
;
...
...
libavcodec/h264_parser.c
View file @
0782fb6b
...
...
@@ -92,7 +92,7 @@ static int h264_find_frame_end(H264Context *h, const uint8_t *buf,
state
=
7
;
}
else
{
h
->
parse_history
[
h
->
parse_history_count
++
]
=
buf
[
i
];
if
(
h
->
parse_history_count
>
3
)
{
if
(
h
->
parse_history_count
>
5
)
{
unsigned
int
mb
,
last_mb
=
h
->
parse_last_mb
;
GetBitContext
gb
;
...
...
@@ -120,7 +120,7 @@ found:
pc
->
frame_start_found
=
0
;
if
(
h
->
is_avc
)
return
next_avc
;
return
i
-
(
state
&
5
)
-
3
*
(
state
>
7
);
return
i
-
(
state
&
5
)
-
5
*
(
state
>
7
);
}
static
int
scan_mmco_reset
(
AVCodecParserContext
*
s
)
...
...
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