diff options
| author | Derek Buitenhuis | 2016-04-10 20:58:15 +0100 |
|---|---|---|
| committer | Derek Buitenhuis | 2016-04-10 20:59:55 +0100 |
| commit | 6f69f7a8bf6a0d013985578df2ef42ee6b1c7994 (patch) | |
| tree | 0c2ec8349ff1763d5f48454b8b9f26374dbd80b0 /libavformat/webpenc.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/webpenc.c')
| -rw-r--r-- | libavformat/webpenc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/webpenc.c b/libavformat/webpenc.c index 2a21730f1b..2e0147cefd 100644 --- a/libavformat/webpenc.c +++ b/libavformat/webpenc.c @@ -42,7 +42,7 @@ static int webp_write_header(AVFormatContext *s) return AVERROR(EINVAL); } st = s->streams[0]; - if (st->codec->codec_id != AV_CODEC_ID_WEBP) { + if (st->codecpar->codec_id != AV_CODEC_ID_WEBP) { av_log(s, AV_LOG_ERROR, "Only WebP is supported\n"); return AVERROR(EINVAL); } @@ -115,8 +115,8 @@ static int flush(AVFormatContext *s, int trailer, int64_t pts) avio_wl32(s->pb, 10); avio_w8(s->pb, flags); avio_wl24(s->pb, 0); - avio_wl24(s->pb, st->codec->width - 1); - avio_wl24(s->pb, st->codec->height - 1); + avio_wl24(s->pb, st->codecpar->width - 1); + avio_wl24(s->pb, st->codecpar->height - 1); } if (!trailer) { avio_write(s->pb, "ANIM", 4); @@ -131,8 +131,8 @@ static int flush(AVFormatContext *s, int trailer, int64_t pts) avio_wl32(s->pb, 16 + w->last_pkt.size - skip); avio_wl24(s->pb, 0); avio_wl24(s->pb, 0); - avio_wl24(s->pb, st->codec->width - 1); - avio_wl24(s->pb, st->codec->height - 1); + avio_wl24(s->pb, st->codecpar->width - 1); + avio_wl24(s->pb, st->codecpar->height - 1); if (w->last_pkt.pts != AV_NOPTS_VALUE && pts != AV_NOPTS_VALUE) { avio_wl24(s->pb, pts - w->last_pkt.pts); } else |