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
bc7f4268
Commit
bc7f4268
authored
May 18, 2016
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
h264: drop tests whether the codec id is AV_CODEC_ID_H264
Those are unused remnants of the old SVQ3 code.
parent
8281cd5c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
6 deletions
+3
-6
h264_slice.c
libavcodec/h264_slice.c
+0
-1
h264dec.c
libavcodec/h264dec.c
+3
-5
No files found.
libavcodec/h264_slice.c
View file @
bc7f4268
...
...
@@ -2111,7 +2111,6 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg)
sl
->
deblocking_filter
=
0
;
sl
->
is_complex
=
FRAME_MBAFF
(
h
)
||
h
->
picture_structure
!=
PICT_FRAME
||
avctx
->
codec_id
!=
AV_CODEC_ID_H264
||
(
CONFIG_GRAY
&&
(
h
->
flags
&
AV_CODEC_FLAG_GRAY
));
if
(
h
->
ps
.
pps
->
cabac
)
{
...
...
libavcodec/h264dec.c
View file @
bc7f4268
...
...
@@ -371,11 +371,9 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx)
return
AVERROR_UNKNOWN
;
}
if
(
avctx
->
codec_id
==
AV_CODEC_ID_H264
)
{
if
(
avctx
->
ticks_per_frame
==
1
)
h
->
avctx
->
framerate
.
num
*=
2
;
avctx
->
ticks_per_frame
=
2
;
}
if
(
avctx
->
ticks_per_frame
==
1
)
h
->
avctx
->
framerate
.
num
*=
2
;
avctx
->
ticks_per_frame
=
2
;
if
(
avctx
->
extradata_size
>
0
&&
avctx
->
extradata
)
{
ret
=
ff_h264_decode_extradata
(
avctx
->
extradata
,
avctx
->
extradata_size
,
...
...
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