[SCM] libav/experimental: Use X ? Y : Z construct, simplify.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit f62c025a5ee898cdaed8f48d2c0ddfd89ac65f16
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date:   Sun Jul 25 14:41:06 2010 +0000

    Use X ? Y : Z construct, simplify.
    
    Originally committed as revision 24496 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffmpeg.c b/ffmpeg.c
index 9c03548..a5dce42 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;

-- 
Libav/FFmpeg packaging