diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-10 22:58:15 +0300 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-10 22:59:55 +0300 |
commit | 6f69f7a8bf6a0d013985578df2ef42ee6b1c7994 (patch) | |
tree | 0c2ec8349ff1763d5f48454b8b9f26374dbd80b0 /libavformat/frmdec.c | |
parent | 60b75186b2c878b6257b43c8fcc0b1356ada218e (diff) | |
parent | 9200514ad8717c63f82101dc394f4378854325bf (diff) |
Merge commit '9200514ad8717c63f82101dc394f4378854325bf'
* commit '9200514ad8717c63f82101dc394f4378854325bf':
lavf: replace AVStream.codec with AVStream.codecpar
This has been a HUGE effort from:
- Derek Buitenhuis <derek.buitenhuis@gmail.com>
- Hendrik Leppkes <h.leppkes@gmail.com>
- wm4 <nfxjfg@googlemail.com>
- Clément Bœsch <clement@stupeflix.com>
- James Almer <jamrial@gmail.com>
- Michael Niedermayer <michael@niedermayer.cc>
- Rostislav Pehlivanov <atomnuker@gmail.com>
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavformat/frmdec.c')
-rw-r--r-- | libavformat/frmdec.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libavformat/frmdec.c b/libavformat/frmdec.c index 260afbc588..2f6b726427 100644 --- a/libavformat/frmdec.c +++ b/libavformat/frmdec.c @@ -58,30 +58,30 @@ static int frm_read_header(AVFormatContext *avctx) if (!st) return AVERROR(ENOMEM); - st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = AV_CODEC_ID_RAWVIDEO; + st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; + st->codecpar->codec_id = AV_CODEC_ID_RAWVIDEO; avio_skip(pb, 3); - st->codec->pix_fmt = avpriv_find_pix_fmt(frm_pix_fmt_tags, avio_r8(pb)); - if (!st->codec->pix_fmt) + st->codecpar->format = avpriv_find_pix_fmt(frm_pix_fmt_tags, avio_r8(pb)); + if (!st->codecpar->format) return AVERROR_INVALIDDATA; - st->codec->codec_tag = 0; - st->codec->width = avio_rl16(pb); - st->codec->height = avio_rl16(pb); + st->codecpar->codec_tag = 0; + st->codecpar->width = avio_rl16(pb); + st->codecpar->height = avio_rl16(pb); return 0; } static int frm_read_packet(AVFormatContext *avctx, AVPacket *pkt) { FrmContext *s = avctx->priv_data; - AVCodecContext *stc = avctx->streams[0]->codec; + AVCodecParameters *par = avctx->streams[0]->codecpar; int packet_size, ret; if (s->count) return AVERROR_EOF; - packet_size = av_image_get_buffer_size(stc->pix_fmt, stc->width, stc->height, 1); + packet_size = av_image_get_buffer_size(par->format, par->width, par->height, 1); if (packet_size < 0) return AVERROR_INVALIDDATA; @@ -89,7 +89,7 @@ static int frm_read_packet(AVFormatContext *avctx, AVPacket *pkt) if (ret < 0) return ret; - if (stc->pix_fmt == AV_PIX_FMT_BGRA) { + if (par->format == AV_PIX_FMT_BGRA) { int i; for (i = 3; i + 1 <= pkt->size; i += 4) pkt->data[i] = 0xFF - pkt->data[i]; |