summaryrefslogtreecommitdiff
path: root/avconv.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-12-31 17:15:50 +0100
committerAnton Khirnov <anton@khirnov.net>2012-01-12 09:02:01 +0100
commitb2ce3b998b90c9ec8dcefe4b2c45fcf5b2f0a903 (patch)
tree67579b8d8ea97ecb063257361773b6e0ddf67ce2 /avconv.c
parent3167dc9515810bbdd86d99d773bcf84657d2e72a (diff)
avconv: use AVFrame.width/height/format instead of corresponding AVCodecContext fields
Diffstat (limited to 'avconv.c')
-rw-r--r--avconv.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/avconv.c b/avconv.c
index c96cc73280..817c0cf928 100644
--- a/avconv.c
+++ b/avconv.c
@@ -1262,19 +1262,18 @@ static void do_video_resample(OutputStream *ost,
AVFrame **out_picture)
{
int resample_changed = 0;
- AVCodecContext *dec = ist->st->codec;
*out_picture = in_picture;
- 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;
}
@@ -1301,9 +1300,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