[FFmpeg-devel] [PATCH 3/5] Use X ? Y : Z construct, simplify.

Stefano Sabatini stefano.sabatini-lala
Sun Jul 25 12:44:15 CEST 2010


---
 ffmpeg.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 105104f..77f6270 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1291,10 +1291,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;
-- 
1.7.0.4




More information about the ffmpeg-devel mailing list