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
de1824e9
Commit
de1824e9
authored
May 11, 2012
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mpeg12: fix logic that prevents extradata from being parsed twice.
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
e20f4648
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
mpeg12.c
libavcodec/mpeg12.c
+2
-1
mpeg12.h
libavcodec/mpeg12.h
+1
-0
No files found.
libavcodec/mpeg12.c
View file @
de1824e9
...
...
@@ -2286,12 +2286,13 @@ static int mpeg_decode_frame(AVCodecContext *avctx,
s
->
slice_count
=
0
;
if
(
avctx
->
extradata
&&
!
avctx
->
frame_number
)
{
if
(
avctx
->
extradata
&&
!
s
->
parsed_extra
)
{
int
ret
=
decode_chunks
(
avctx
,
picture
,
data_size
,
avctx
->
extradata
,
avctx
->
extradata_size
);
if
(
*
data_size
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"picture in extradata
\n
"
);
*
data_size
=
0
;
}
s
->
parsed_extra
=
1
;
if
(
ret
<
0
&&
(
avctx
->
err_recognition
&
AV_EF_EXPLODE
))
return
ret
;
}
...
...
libavcodec/mpeg12.h
View file @
de1824e9
...
...
@@ -42,6 +42,7 @@ typedef struct Mpeg1Context {
AVRational
frame_rate_ext
;
///< MPEG-2 specific framerate modificator
int
sync
;
///< Did we reach a sync point like a GOP/SEQ/KEYFrame?
int
tmpgexs
;
int
parsed_extra
;
}
Mpeg1Context
;
extern
uint8_t
ff_mpeg12_static_rl_table_store
[
2
][
2
][
2
*
MAX_RUN
+
MAX_LEVEL
+
3
];
...
...
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