[FFmpeg-cvslog] ffmpeg: reformat resample condition code in transcode()

Stefano Sabatini git at videolan.org
Tue Apr 19 12:25:30 CEST 2011


ffmpeg | branch: master | Stefano Sabatini <stefano.sabatini-lala at poste.it> | Sat Apr 16 23:18:22 2011 +0200| [c438c9075655951a8de2c41af1f76574cf22ab85] | committer: Stefano Sabatini

ffmpeg: reformat resample condition code in transcode()

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala at poste.it>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c438c9075655951a8de2c41af1f76574cf22ab85
---

 ffmpeg.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index af5fa64..eadfc80 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2284,9 +2284,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);



More information about the ffmpeg-cvslog mailing list