aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-03-23 20:59:09 +0100
committerAnton Khirnov <anton@khirnov.net>2012-04-15 20:22:36 +0200
commit9dced8542618c12e0496e7db3067a61ba9080a45 (patch)
tree2d47b548881bbb811404ecbf7e6880380169f4e9
parentb7327887ea260d26e4fe98d34149cd57168f2ba3 (diff)
downloadffmpeg-9dced8542618c12e0496e7db3067a61ba9080a45.tar.gz
avconv: remove a useless variable from OutputStream.
-rw-r--r--avconv.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/avconv.c b/avconv.c
index fa2634cd7e..c7b4cbd03d 100644
--- a/avconv.c
+++ b/avconv.c
@@ -215,7 +215,6 @@ typedef struct OutputStream {
AVFrame *output_frame;
/* video only */
- int video_resample;
int resample_height;
int resample_width;
int resample_pix_fmt;
@@ -2422,10 +2421,9 @@ static int transcode_init(void)
exit(1);
}
- ost->video_resample = codec->width != icodec->width ||
- codec->height != icodec->height ||
- codec->pix_fmt != icodec->pix_fmt;
- if (ost->video_resample) {
+ if (codec->width != icodec->width ||
+ codec->height != icodec->height ||
+ codec->pix_fmt != icodec->pix_fmt) {
codec->bits_per_raw_sample = 0;
}