On 2011-12-31 17:17:56 +0100, Anton Khirnov wrote:
> ---
> avconv.c | 15 +++++++--------
> 1 files changed, 7 insertions(+), 8 deletions(-)
>
> diff --git a/avconv.c b/avconv.c
> index add2ba1..819a078 100644
> --- a/avconv.c
> +++ b/avconv.c
> @@ -1241,20 +1241,19 @@ static void do_video_resample(OutputStream *ost,
> AVFrame **out_picture)
> {
> int resample_changed = 0;
> - AVCodecContext *dec = ist->st->codec;
> *out_picture = in_picture;
>
> #if !CONFIG_AVFILTER
> - resample_changed = ost->resample_width != dec->width ||
> - ost->resample_height != dec->height ||
> - ost->resample_pix_fmt != dec->pix_fmt;
> + resample_changed = ost->resample_width != in_picture->width ||
> + ost->resample_height != in_picture->height ||
> + ost->resample_pix_fmt != in_picture->format;
>
> if (resample_changed) {
> av_log(NULL, AV_LOG_INFO,
> "Input stream #%d:%d frame changed from size:%dx%d fmt:%s to
> size:%dx%d fmt:%s\n",
> ist->file_index, ist->st->index,
> ost->resample_width, ost->resample_height,
> av_get_pix_fmt_name(ost->resample_pix_fmt),
> - dec->width , dec->height ,
> av_get_pix_fmt_name(dec->pix_fmt));
> + in_picture->width, in_picture->height,
> av_get_pix_fmt_name(in_picture->format));
> if (!ost->video_resample)
> ost->video_resample = 1;
> }
> @@ -1281,9 +1280,9 @@ static void do_video_resample(OutputStream *ost,
> 0, ost->resample_height, (*out_picture)->data,
> (*out_picture)->linesize);
> }
> if (resample_changed) {
> - ost->resample_width = dec->width;
> - ost->resample_height = dec->height;
> - ost->resample_pix_fmt = dec->pix_fmt;
> + ost->resample_width = in_picture->width;
> + ost->resample_height = in_picture->height;
> + ost->resample_pix_fmt = in_picture->format;
> }
> #endif
> }
ok
Janne
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
