aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2011-04-16 23:18:22 +0200
committerAnton Khirnov <anton@khirnov.net>2011-05-11 07:32:37 +0200
commit2b95602e93226bd269676b0edcda5322b5be8444 (patch)
tree75c3b761ea5b5b52169fb0236b174418572839a1 /ffmpeg.c
parent9aa797cd2873562e85d04ea45ef7f49ad2cb07b9 (diff)
downloadffmpeg-2b95602e93226bd269676b0edcda5322b5be8444.tar.gz
ffmpeg: reformat resample condition code in transcode()
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it> Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 647018c083..738fb7b922 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2171,9 +2171,9 @@ static int transcode(AVFormatContext **output_files,
fprintf(stderr, "Video pixel format is unknown, stream cannot be encoded\n");
ffmpeg_exit(1);
}
- ost->video_resample = (codec->width != icodec->width ||
- codec->height != icodec->height ||
- (codec->pix_fmt != icodec->pix_fmt));
+ ost->video_resample = codec->width != icodec->width ||
+ codec->height != icodec->height ||
+ codec->pix_fmt != icodec->pix_fmt;
if (ost->video_resample) {
#if !CONFIG_AVFILTER
avcodec_get_frame_defaults(&ost->pict_tmp);