From f62c025a5ee898cdaed8f48d2c0ddfd89ac65f16 Mon Sep 17 00:00:00 2001
From: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Date: Sun, 25 Jul 2010 14:41:06 +0000
Subject: [PATCH] Use X ? Y : Z construct, simplify.
Originally committed as revision 24496 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
ffmpeg.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index 9c0354812dc..a5dce42ba78 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1290,10 +1290,7 @@ static void do_video_out(AVFormatContext *s,
/* handles sameq here. This is not correct because it may
not be a global option */
- if (same_quality) {
- big_picture.quality = ist->st->quality;
- }else
- big_picture.quality = ost->st->quality;
+ big_picture.quality = same_quality ? ist->st->quality : ost->st->quality;
if(!me_threshold)
big_picture.pict_type = 0;
// big_picture.pts = AV_NOPTS_VALUE;
--
GitLab