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
b4b167ec
Commit
b4b167ec
authored
Apr 02, 2011
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
jvdec: don't use deprecated CODEC_TYPE_*/PKT_FLAG_KEY
parent
aa05f212
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
jvdec.c
libavcodec/jvdec.c
+1
-1
jvdec.c
libavformat/jvdec.c
+4
-4
No files found.
libavcodec/jvdec.c
View file @
b4b167ec
...
...
@@ -205,7 +205,7 @@ static av_cold int decode_close(AVCodecContext *avctx)
AVCodec
ff_jv_decoder
=
{
.
name
=
"jv"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Bitmap Brothers JV video"
),
.
type
=
CODEC
_TYPE_VIDEO
,
.
type
=
AVMEDIA
_TYPE_VIDEO
,
.
id
=
CODEC_ID_JV
,
.
priv_data_size
=
sizeof
(
JvContext
),
.
init
=
decode_init
,
...
...
libavformat/jvdec.c
View file @
b4b167ec
...
...
@@ -74,7 +74,7 @@ static int read_header(AVFormatContext *s,
if
(
!
ast
||
!
vst
)
return
AVERROR
(
ENOMEM
);
vst
->
codec
->
codec_type
=
CODEC
_TYPE_VIDEO
;
vst
->
codec
->
codec_type
=
AVMEDIA
_TYPE_VIDEO
;
vst
->
codec
->
codec_id
=
CODEC_ID_JV
;
vst
->
codec
->
codec_tag
=
0
;
/* no fourcc */
vst
->
codec
->
width
=
avio_rl16
(
pb
);
...
...
@@ -85,7 +85,7 @@ static int read_header(AVFormatContext *s,
avio_skip
(
pb
,
4
);
ast
->
codec
->
codec_type
=
CODEC
_TYPE_AUDIO
;
ast
->
codec
->
codec_type
=
AVMEDIA
_TYPE_AUDIO
;
ast
->
codec
->
codec_id
=
CODEC_ID_PCM_U8
;
ast
->
codec
->
codec_tag
=
0
;
/* no fourcc */
ast
->
codec
->
sample_rate
=
avio_rl16
(
pb
);
...
...
@@ -151,7 +151,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
return
AVERROR
(
ENOMEM
);
pkt
->
stream_index
=
0
;
pkt
->
pts
=
e
->
timestamp
;
pkt
->
flags
|=
PKT_FLAG_KEY
;
pkt
->
flags
|=
AV_
PKT_FLAG_KEY
;
return
0
;
}
case
JV_VIDEO
:
...
...
@@ -170,7 +170,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
pkt
->
stream_index
=
1
;
pkt
->
pts
=
jv
->
pts
;
if
(
jvf
->
video_type
!=
1
)
pkt
->
flags
|=
PKT_FLAG_KEY
;
pkt
->
flags
|=
AV_
PKT_FLAG_KEY
;
return
0
;
}
case
JV_PADDING
:
...
...
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