[FFmpeg-cvslog] r24496 - trunk/ffmpeg.c

[stefano]

Author: stefano
Date: Sun Jul 25 16:41:06 2010
New Revision: 24496

Log:
Use X ? Y : Z construct, simplify.

Modified:
   trunk/ffmpeg.c

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	Sun Jul 25 16:35:12 2010	(r24495)
+++ trunk/ffmpeg.c	Sun Jul 25 16:41:06 2010	(r24496)
@@ -1290,10 +1290,7 @@ static void do_video_out(AVFormatContext
 
             /* 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;