mirror of https://git.ffmpeg.org/ffmpeg.git
Use X ? Y : Z construct, simplify.
Originally committed as revision 24496 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
853a0fccce
commit
f62c025a5e
5
ffmpeg.c
5
ffmpeg.c
|
@ -1290,10 +1290,7 @@ static void do_video_out(AVFormatContext *s,
|
||||||
|
|
||||||
/* handles sameq here. This is not correct because it may
|
/* handles sameq here. This is not correct because it may
|
||||||
not be a global option */
|
not be a global option */
|
||||||
if (same_quality) {
|
big_picture.quality = same_quality ? ist->st->quality : ost->st->quality;
|
||||||
big_picture.quality = ist->st->quality;
|
|
||||||
}else
|
|
||||||
big_picture.quality = ost->st->quality;
|
|
||||||
if(!me_threshold)
|
if(!me_threshold)
|
||||||
big_picture.pict_type = 0;
|
big_picture.pict_type = 0;
|
||||||
// big_picture.pts = AV_NOPTS_VALUE;
|
// big_picture.pts = AV_NOPTS_VALUE;
|
||||||
|
|
Loading…
Reference in New Issue