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
ff7ffe48
Commit
ff7ffe48
authored
Nov 29, 2013
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mpeg4videodec: move showed_packed_warning from MpegEncContext to Mpeg4DecContext
parent
f7d22867
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
mpeg4video.h
libavcodec/mpeg4video.h
+2
-0
mpeg4videodec.c
libavcodec/mpeg4videodec.c
+2
-2
mpegvideo.h
libavcodec/mpegvideo.h
+0
-1
No files found.
libavcodec/mpeg4video.h
View file @
ff7ffe48
...
...
@@ -92,6 +92,8 @@ typedef struct Mpeg4DecContext {
int
divx_build
;
int
xvid_build
;
int
lavc_build
;
///< flag for having shown the warning about divxs invalid b frames
int
showed_packed_warning
;
int
cplx_estimation_trash_i
;
int
cplx_estimation_trash_p
;
...
...
libavcodec/mpeg4videodec.c
View file @
ff7ffe48
...
...
@@ -2016,10 +2016,10 @@ static int decode_user_data(Mpeg4DecContext *ctx, GetBitContext *gb)
ctx
->
divx_version
=
ver
;
ctx
->
divx_build
=
build
;
s
->
divx_packed
=
e
==
3
&&
last
==
'p'
;
if
(
s
->
divx_packed
&&
!
s
->
showed_packed_warning
)
{
if
(
s
->
divx_packed
&&
!
ctx
->
showed_packed_warning
)
{
av_log
(
s
->
avctx
,
AV_LOG_WARNING
,
"Invalid and inefficient vfw-avi packed B frames detected
\n
"
);
s
->
showed_packed_warning
=
1
;
ctx
->
showed_packed_warning
=
1
;
}
}
...
...
libavcodec/mpegvideo.h
View file @
ff7ffe48
...
...
@@ -553,7 +553,6 @@ typedef struct MpegEncContext {
/* H.263 specific */
int
gob_index
;
int
obmc
;
///< overlapped block motion compensation
int
showed_packed_warning
;
///< flag for having shown the warning about divxs invalid b frames
int
mb_info
;
///< interval for outputting info about mb offsets as side data
int
prev_mb_info
,
last_mb_info
;
uint8_t
*
mb_info_ptr
;
...
...
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