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
e89247de
Commit
e89247de
authored
Nov 26, 2013
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mpeg4videodec: replace MpegEncContext.reduced_res_vop with a local variable
parent
8cebc9ea
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
4 deletions
+1
-4
mpeg4videodec.c
libavcodec/mpeg4videodec.c
+1
-3
mpegvideo.h
libavcodec/mpegvideo.h
+0
-1
No files found.
libavcodec/mpeg4videodec.c
View file @
e89247de
...
@@ -1946,13 +1946,11 @@ no_cplx_est:
...
@@ -1946,13 +1946,11 @@ no_cplx_est:
skip_bits
(
gb
,
2
);
/* requested upstream message type */
skip_bits
(
gb
,
2
);
/* requested upstream message type */
skip_bits1
(
gb
);
/* newpred segment type */
skip_bits1
(
gb
);
/* newpred segment type */
}
}
s
->
reduced_res_vop
=
get_bits1
(
gb
);
if
(
get_bits1
(
gb
))
// reduced_res_vop
if
(
s
->
reduced_res_vop
)
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
"reduced resolution VOP not supported
\n
"
);
"reduced resolution VOP not supported
\n
"
);
}
else
{
}
else
{
s
->
new_pred
=
0
;
s
->
new_pred
=
0
;
s
->
reduced_res_vop
=
0
;
}
}
s
->
scalability
=
get_bits1
(
gb
);
s
->
scalability
=
get_bits1
(
gb
);
...
...
libavcodec/mpegvideo.h
View file @
e89247de
...
@@ -593,7 +593,6 @@ typedef struct MpegEncContext {
...
@@ -593,7 +593,6 @@ typedef struct MpegEncContext {
int
hierachy_type
;
int
hierachy_type
;
int
enhancement_type
;
int
enhancement_type
;
int
new_pred
;
int
new_pred
;
int
reduced_res_vop
;
int
aspect_ratio_info
;
//FIXME remove
int
aspect_ratio_info
;
//FIXME remove
int
sprite_warping_accuracy
;
int
sprite_warping_accuracy
;
int
data_partitioning
;
///< data partitioning flag from header
int
data_partitioning
;
///< data partitioning flag from header
...
...
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