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
6e81597d
Commit
6e81597d
authored
Nov 26, 2013
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mpeg4videodec: move enhancement_type from MpegEncContext to Mpeg4DecContext
parent
2992afda
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
mpeg4video.h
libavcodec/mpeg4video.h
+1
-0
mpeg4videodec.c
libavcodec/mpeg4videodec.c
+2
-2
mpegvideo.h
libavcodec/mpegvideo.h
+0
-1
No files found.
libavcodec/mpeg4video.h
View file @
6e81597d
...
@@ -74,6 +74,7 @@ typedef struct Mpeg4DecContext {
...
@@ -74,6 +74,7 @@ typedef struct Mpeg4DecContext {
int
t_frame
;
int
t_frame
;
int
new_pred
;
int
new_pred
;
int
enhancement_type
;
/* bug workarounds */
/* bug workarounds */
int
divx_version
;
int
divx_version
;
...
...
libavcodec/mpeg4videodec.c
View file @
6e81597d
...
@@ -1969,7 +1969,7 @@ no_cplx_est:
...
@@ -1969,7 +1969,7 @@ no_cplx_est:
h_sampling_factor_m
=
get_bits
(
gb
,
5
);
h_sampling_factor_m
=
get_bits
(
gb
,
5
);
v_sampling_factor_n
=
get_bits
(
gb
,
5
);
v_sampling_factor_n
=
get_bits
(
gb
,
5
);
v_sampling_factor_m
=
get_bits
(
gb
,
5
);
v_sampling_factor_m
=
get_bits
(
gb
,
5
);
s
->
enhancement_type
=
get_bits1
(
gb
);
ctx
->
enhancement_type
=
get_bits1
(
gb
);
if
(
h_sampling_factor_n
==
0
||
h_sampling_factor_m
==
0
||
if
(
h_sampling_factor_n
==
0
||
h_sampling_factor_m
==
0
||
v_sampling_factor_n
==
0
||
v_sampling_factor_m
==
0
)
{
v_sampling_factor_n
==
0
||
v_sampling_factor_m
==
0
)
{
...
@@ -2253,7 +2253,7 @@ static int decode_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb)
...
@@ -2253,7 +2253,7 @@ static int decode_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb)
if
(
ctx
->
shape
!=
RECT_SHAPE
&&
s
->
pict_type
!=
AV_PICTURE_TYPE_I
)
if
(
ctx
->
shape
!=
RECT_SHAPE
&&
s
->
pict_type
!=
AV_PICTURE_TYPE_I
)
skip_bits1
(
gb
);
// vop shape coding type
skip_bits1
(
gb
);
// vop shape coding type
}
else
{
}
else
{
if
(
s
->
enhancement_type
)
{
if
(
ctx
->
enhancement_type
)
{
int
load_backward_shape
=
get_bits1
(
gb
);
int
load_backward_shape
=
get_bits1
(
gb
);
if
(
load_backward_shape
)
if
(
load_backward_shape
)
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
...
...
libavcodec/mpegvideo.h
View file @
6e81597d
...
@@ -590,7 +590,6 @@ typedef struct MpegEncContext {
...
@@ -590,7 +590,6 @@ typedef struct MpegEncContext {
int
quant_precision
;
int
quant_precision
;
int
quarter_sample
;
///< 1->qpel, 0->half pel ME/MC
int
quarter_sample
;
///< 1->qpel, 0->half pel ME/MC
int
scalability
;
int
scalability
;
int
enhancement_type
;
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