diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-10 20:58:15 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-10 20:59:55 +0100 |
| commit | 6f69f7a8bf6a0d013985578df2ef42ee6b1c7994 (patch) | |
| tree | 0c2ec8349ff1763d5f48454b8b9f26374dbd80b0 /libavdevice/fbdev_enc.c | |
| parent | 60b75186b2c878b6257b43c8fcc0b1356ada218e (diff) | |
| parent | 9200514ad8717c63f82101dc394f4378854325bf (diff) | |
| download | ffmpeg-6f69f7a8bf6a0d013985578df2ef42ee6b1c7994.tar.gz | |
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 'libavdevice/fbdev_enc.c')
| -rw-r--r-- | libavdevice/fbdev_enc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavdevice/fbdev_enc.c b/libavdevice/fbdev_enc.c index 28efc7131b..b4e5f84975 100644 --- a/libavdevice/fbdev_enc.c +++ b/libavdevice/fbdev_enc.c @@ -48,7 +48,7 @@ static av_cold int fbdev_write_header(AVFormatContext *h) int ret, flags = O_RDWR; const char* device; - if (h->nb_streams != 1 || h->streams[0]->codec->codec_type != AVMEDIA_TYPE_VIDEO) { + if (h->nb_streams != 1 || h->streams[0]->codecpar->codec_type != AVMEDIA_TYPE_VIDEO) { av_log(fbdev, AV_LOG_ERROR, "Only a single video stream is supported.\n"); return AVERROR(EINVAL); } @@ -105,11 +105,11 @@ static int fbdev_write_packet(AVFormatContext *h, AVPacket *pkt) enum AVPixelFormat fb_pix_fmt; int disp_height; int bytes_to_copy; - AVCodecContext *codec_ctx = h->streams[0]->codec; - enum AVPixelFormat video_pix_fmt = codec_ctx->pix_fmt; - int video_width = codec_ctx->width; - int video_height = codec_ctx->height; - int bytes_per_pixel = ((codec_ctx->bits_per_coded_sample + 7) >> 3); + AVCodecParameters *par = h->streams[0]->codecpar; + enum AVPixelFormat video_pix_fmt = par->format; + int video_width = par->width; + int video_height = par->height; + int bytes_per_pixel = ((par->bits_per_coded_sample + 7) >> 3); int src_line_size = video_width * bytes_per_pixel; int i; |