diff options
| author | Anton Khirnov <anton@khirnov.net> | 2014-04-05 08:48:24 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2014-06-01 08:33:11 +0200 |
| commit | 41776ba9c0ebbb71394cefdf7dd1b243e6c852d5 (patch) | |
| tree | b282e400618dc04d9a431ef518f54a73f74b32cb /avconv_filter.c | |
| parent | e19d48dfce52f1417f7f06143b96fed00cbcdc52 (diff) | |
| download | ffmpeg-41776ba9c0ebbb71394cefdf7dd1b243e6c852d5.tar.gz | |
avconv: do not use the stream codec context for decoding
Diffstat (limited to 'avconv_filter.c')
| -rw-r--r-- | avconv_filter.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/avconv_filter.c b/avconv_filter.c index 892db00f47..c667992165 100644 --- a/avconv_filter.c +++ b/avconv_filter.c @@ -149,7 +149,7 @@ static void init_input_filter(FilterGraph *fg, AVFilterInOut *in) /* find the first unused stream of corresponding type */ for (i = 0; i < nb_input_streams; i++) { ist = input_streams[i]; - if (ist->st->codec->codec_type == type && ist->discard) + if (ist->dec_ctx->codec_type == type && ist->discard) break; } if (i == nb_input_streams) { @@ -433,10 +433,10 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, sar = ist->st->sample_aspect_ratio.num ? ist->st->sample_aspect_ratio : - ist->st->codec->sample_aspect_ratio; - snprintf(args, sizeof(args), "%d:%d:%d:%d:%d:%d:%d", ist->st->codec->width, - ist->st->codec->height, - ist->hwaccel_retrieve_data ? ist->hwaccel_retrieved_pix_fmt : ist->st->codec->pix_fmt, + ist->dec_ctx->sample_aspect_ratio; + snprintf(args, sizeof(args), "%d:%d:%d:%d:%d:%d:%d", ist->dec_ctx->width, + ist->dec_ctx->height, + ist->hwaccel_retrieve_data ? ist->hwaccel_retrieved_pix_fmt : ist->dec_ctx->pix_fmt, tb.num, tb.den, sar.num, sar.den); snprintf(name, sizeof(name), "graph %d input from stream %d:%d", fg->index, ist->file_index, ist->st->index); @@ -487,10 +487,10 @@ static int configure_input_audio_filter(FilterGraph *fg, InputFilter *ifilter, snprintf(args, sizeof(args), "time_base=%d/%d:sample_rate=%d:sample_fmt=%s" ":channel_layout=0x%"PRIx64, - 1, ist->st->codec->sample_rate, - ist->st->codec->sample_rate, - av_get_sample_fmt_name(ist->st->codec->sample_fmt), - ist->st->codec->channel_layout); + 1, ist->dec_ctx->sample_rate, + ist->dec_ctx->sample_rate, + av_get_sample_fmt_name(ist->dec_ctx->sample_fmt), + ist->dec_ctx->channel_layout); snprintf(name, sizeof(name), "graph %d input from stream %d:%d", fg->index, ist->file_index, ist->st->index); |