Skip to content

F
ffmpeg.wasm-core
Commit b4b167ec authored by Anton Khirnov's avatar Anton Khirnov
Browse files
Options

jvdec: don't use deprecated CODEC_TYPE_*/PKT_FLAG_KEY

parent aa05f212
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
libavcodec/jvdec.c
View file @ b4b167ec
...@@ -205,7 +205,7 @@ static av_cold int decode_close(AVCodecContext *avctx) ...@@ -205,7 +205,7 @@ static av_cold int decode_close(AVCodecContext *avctx)
AVCodec ff_jv_decoder = { AVCodec ff_jv_decoder = {
.name = "jv", .name = "jv",
.long_name = NULL_IF_CONFIG_SMALL("Bitmap Brothers JV video"), .long_name = NULL_IF_CONFIG_SMALL("Bitmap Brothers JV video"),
.type = CODEC_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_JV, .id = CODEC_ID_JV,
.priv_data_size = sizeof(JvContext), .priv_data_size = sizeof(JvContext),
.init = decode_init, .init = decode_init,
......
libavformat/jvdec.c
View file @ b4b167ec
...@@ -74,7 +74,7 @@ static int read_header(AVFormatContext *s, ...@@ -74,7 +74,7 @@ static int read_header(AVFormatContext *s,
if (!ast || !vst) if (!ast || !vst)
return AVERROR(ENOMEM); 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_id = CODEC_ID_JV;
vst->codec->codec_tag = 0; /* no fourcc */ vst->codec->codec_tag = 0; /* no fourcc */
vst->codec->width = avio_rl16(pb); vst->codec->width = avio_rl16(pb);
...@@ -85,7 +85,7 @@ static int read_header(AVFormatContext *s, ...@@ -85,7 +85,7 @@ static int read_header(AVFormatContext *s,
avio_skip(pb, 4); 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_id = CODEC_ID_PCM_U8;
ast->codec->codec_tag = 0; /* no fourcc */ ast->codec->codec_tag = 0; /* no fourcc */
ast->codec->sample_rate = avio_rl16(pb); ast->codec->sample_rate = avio_rl16(pb);
...@@ -151,7 +151,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -151,7 +151,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
pkt->stream_index = 0; pkt->stream_index = 0;
pkt->pts = e->timestamp; pkt->pts = e->timestamp;
pkt->flags |= PKT_FLAG_KEY; pkt->flags |= AV_PKT_FLAG_KEY;
return 0; return 0;
} }
case JV_VIDEO: case JV_VIDEO:
...@@ -170,7 +170,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -170,7 +170,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
pkt->stream_index = 1; pkt->stream_index = 1;
pkt->pts = jv->pts; pkt->pts = jv->pts;
if (jvf->video_type != 1) if (jvf->video_type != 1)
pkt->flags |= PKT_FLAG_KEY; pkt->flags |= AV_PKT_FLAG_KEY;
return 0; return 0;
} }
case JV_PADDING: case JV_PADDING:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment