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
75cc57f7
Commit
75cc57f7
authored
Jan 02, 2015
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/mpeg12dec: Check actual aspect ratio instead of aspect_ratio_info
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
1010b36d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
mpeg12dec.c
libavcodec/mpeg12dec.c
+3
-3
No files found.
libavcodec/mpeg12dec.c
View file @
75cc57f7
...
@@ -59,7 +59,7 @@ typedef struct Mpeg1Context {
...
@@ -59,7 +59,7 @@ typedef struct Mpeg1Context {
uint8_t
afd
;
uint8_t
afd
;
int
has_afd
;
int
has_afd
;
int
slice_count
;
int
slice_count
;
int
save_aspect_info
;
AVRational
save_aspect
;
int
save_width
,
save_height
,
save_progressive_seq
;
int
save_width
,
save_height
,
save_progressive_seq
;
AVRational
frame_rate_ext
;
/* MPEG-2 specific framerate modificator */
AVRational
frame_rate_ext
;
/* MPEG-2 specific framerate modificator */
int
sync
;
/* Did we reach a sync point like a GOP/SEQ/KEYFrame? */
int
sync
;
/* Did we reach a sync point like a GOP/SEQ/KEYFrame? */
...
@@ -1322,7 +1322,7 @@ static int mpeg_decode_postinit(AVCodecContext *avctx)
...
@@ -1322,7 +1322,7 @@ static int mpeg_decode_postinit(AVCodecContext *avctx)
avctx
->
coded_height
!=
s
->
height
||
avctx
->
coded_height
!=
s
->
height
||
s1
->
save_width
!=
s
->
width
||
s1
->
save_width
!=
s
->
width
||
s1
->
save_height
!=
s
->
height
||
s1
->
save_height
!=
s
->
height
||
s1
->
save_aspect_info
!=
s
->
aspect_ratio_info
||
av_cmp_q
(
s1
->
save_aspect
,
s
->
avctx
->
sample_aspect_ratio
)
||
(
s1
->
save_progressive_seq
!=
s
->
progressive_sequence
&&
FFALIGN
(
s
->
height
,
16
)
!=
FFALIGN
(
s
->
height
,
32
))
||
(
s1
->
save_progressive_seq
!=
s
->
progressive_sequence
&&
FFALIGN
(
s
->
height
,
16
)
!=
FFALIGN
(
s
->
height
,
32
))
||
0
)
{
0
)
{
if
(
s1
->
mpeg_enc_ctx_allocated
)
{
if
(
s1
->
mpeg_enc_ctx_allocated
)
{
...
@@ -1343,7 +1343,7 @@ static int mpeg_decode_postinit(AVCodecContext *avctx)
...
@@ -1343,7 +1343,7 @@ static int mpeg_decode_postinit(AVCodecContext *avctx)
(
s
->
bit_rate
!=
0x3FFFF
*
400
||
s
->
vbv_delay
!=
0xFFFF
))
{
(
s
->
bit_rate
!=
0x3FFFF
*
400
||
s
->
vbv_delay
!=
0xFFFF
))
{
avctx
->
bit_rate
=
s
->
bit_rate
;
avctx
->
bit_rate
=
s
->
bit_rate
;
}
}
s1
->
save_aspect
_info
=
s
->
aspect_ratio_inf
o
;
s1
->
save_aspect
=
s
->
avctx
->
sample_aspect_rati
o
;
s1
->
save_width
=
s
->
width
;
s1
->
save_width
=
s
->
width
;
s1
->
save_height
=
s
->
height
;
s1
->
save_height
=
s
->
height
;
s1
->
save_progressive_seq
=
s
->
progressive_sequence
;
s1
->
save_progressive_seq
=
s
->
progressive_sequence
;
...
...
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