From 01735b4852c65081eaead3d9d405ef30fbb5a6ee Mon Sep 17 00:00:00 2001 From: Nicolas George Date: Sat, 6 Jan 2018 14:34:00 +0100 Subject: tools/uncoded_frame: remove use of AVStream.codec. --- tools/uncoded_frame.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) (limited to 'tools') diff --git a/tools/uncoded_frame.c b/tools/uncoded_frame.c index f346b21916..606bdb746a 100644 --- a/tools/uncoded_frame.c +++ b/tools/uncoded_frame.c @@ -161,26 +161,24 @@ int main(int argc, char **argv) av_log(NULL, AV_LOG_ERROR, "Failed to create output stream\n"); goto fail; } - st->stream->codec->codec_type = av_buffersink_get_type(st->sink); - st->stream->time_base = st->stream->codec->time_base = - av_buffersink_get_time_base(st->sink); + st->stream->codecpar->codec_type = av_buffersink_get_type(st->sink); + st->stream->time_base = av_buffersink_get_time_base(st->sink); switch (av_buffersink_get_type(st->sink)) { case AVMEDIA_TYPE_VIDEO: - st->stream->codec->codec_id = AV_CODEC_ID_RAWVIDEO; + st->stream->codecpar->codec_id = AV_CODEC_ID_RAWVIDEO; st->stream->avg_frame_rate = st->stream-> r_frame_rate = av_buffersink_get_frame_rate(st->sink); - st->stream->codec->width = av_buffersink_get_w(st->sink); - st->stream->codec->height = av_buffersink_get_h(st->sink); - st->stream->codec->sample_aspect_ratio = av_buffersink_get_sample_aspect_ratio(st->sink); - st->stream->codec->pix_fmt = av_buffersink_get_format(st->sink); + st->stream->codecpar->width = av_buffersink_get_w(st->sink); + st->stream->codecpar->height = av_buffersink_get_h(st->sink); + st->stream->codecpar->sample_aspect_ratio = av_buffersink_get_sample_aspect_ratio(st->sink); + st->stream->codecpar->format = av_buffersink_get_format(st->sink); break; case AVMEDIA_TYPE_AUDIO: - st->stream->codec->channel_layout = av_buffersink_get_channel_layout(st->sink); - st->stream->codec->channels = av_buffersink_get_channels(st->sink); - st->stream->codec->sample_rate = av_buffersink_get_sample_rate(st->sink); - st->stream->codec->sample_fmt = av_buffersink_get_format(st->sink); - st->stream->codec->codec_id = - av_get_pcm_codec(st->stream->codec->sample_fmt, -1); + st->stream->codecpar->channel_layout = av_buffersink_get_channel_layout(st->sink); + st->stream->codecpar->channels = av_buffersink_get_channels(st->sink); + st->stream->codecpar->sample_rate = av_buffersink_get_sample_rate(st->sink); + st->stream->codecpar->format = av_buffersink_get_format(st->sink); + st->stream->codecpar->codec_id = av_get_pcm_codec(st->stream->codecpar->format, -1); break; default: av_assert0(!"reached"); @@ -245,7 +243,7 @@ int main(int argc, char **argv) frame); frame = NULL; if (ret < 0) { - av_log(st->stream->codec, AV_LOG_ERROR, + av_log(st->mux, AV_LOG_ERROR, "Error writing frame: %s\n", av_err2str(ret)); goto fail; } -- cgit v1.2.3