diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-03 02:28:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-03 02:28:01 +0200 |
| commit | f35439699f5546774b840ae9fba7df82729ef0ff (patch) | |
| tree | 92c22313b8eda656421372955598d647aa64242e /libavformat/jvdec.c | |
| parent | 85c9365d65c4d03c468cead13f722ddce89d8495 (diff) | |
| parent | bc154882e11f4a218cc8cfb10ae0b4cbc83b5f9f (diff) | |
| download | ffmpeg-f35439699f5546774b840ae9fba7df82729ef0ff.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
Fixed-point MDCT with 32-bit unscaled output
lavc: deprecate rate_emu
lavc: mark hurry_up for removal on next major bump
parser: mark av_parser_parse() for removal on next major bump
lavc: add missing audioconvert includes
jvdec: don't use deprecated CODEC_TYPE_*/PKT_FLAG_KEY
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/jvdec.c')
| -rw-r--r-- | libavformat/jvdec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/jvdec.c b/libavformat/jvdec.c index 9235e51a99..448ac00365 100644 --- a/libavformat/jvdec.c +++ b/libavformat/jvdec.c @@ -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: |