OSDN Git Service

ffmpeg: reformat resample condition code in transcode()
authorStefano Sabatini <stefano.sabatini-lala@poste.it>
Sat, 16 Apr 2011 21:18:22 +0000 (23:18 +0200)
committerAnton Khirnov <anton@khirnov.net>
Wed, 11 May 2011 05:32:37 +0000 (07:32 +0200)
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
ffmpeg.c

index 647018c..738fb7b 100644 (file)
--- 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);