summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2010-07-25 14:41:06 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2010-07-25 14:41:06 +0000
commitf62c025a5ee898cdaed8f48d2c0ddfd89ac65f16 (patch)
tree65677467ef83534676ac73bd05883ce48ffb9582 /ffmpeg.c
parent853a0fcccedb2c66cd7596d4f22f7550d0545686 (diff)
Use X ? Y : Z construct, simplify.
Originally committed as revision 24496 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 9c0354812d..a5dce42ba7 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;