MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

swresample/swresample: Remove "less than" comparissions of enums

Browse Source 
Found-by: wm4
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2016-03-22 14:11:03 +01:00
parent ef888de1c1
commit 914ad90edd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libswresample/swresample.c
View File

@ -213,10 +213,10 @@ av_cold int swr_init(struct SwrContext *s){
s->rematrix_custom; s->rematrix_custom;
if(s->int_sample_fmt == AV_SAMPLE_FMT_NONE){ if(s->int_sample_fmt == AV_SAMPLE_FMT_NONE){
if( av_get_planar_sample_fmt(s-> in_sample_fmt) <= AV_SAMPLE_FMT_S16P if( av_get_bytes_per_sample(s-> in_sample_fmt) <= 2
&& av_get_planar_sample_fmt(s->out_sample_fmt) <= AV_SAMPLE_FMT_S16P){ && av_get_bytes_per_sample(s->out_sample_fmt) <= 2){
s->int_sample_fmt= AV_SAMPLE_FMT_S16P; s->int_sample_fmt= AV_SAMPLE_FMT_S16P;
}else if( av_get_planar_sample_fmt(s-> in_sample_fmt) <= AV_SAMPLE_FMT_S16P }else if( av_get_bytes_per_sample(s-> in_sample_fmt) <= 2
&& !s->rematrix && !s->rematrix
&& s->out_sample_rate==s->in_sample_rate && s->out_sample_rate==s->in_sample_rate
&& !(s->flags & SWR_FLAG_RESAMPLE)){ && !(s->flags & SWR_FLAG_RESAMPLE)){
@ -226,7 +226,7 @@ av_cold int swr_init(struct SwrContext *s){
&& !s->rematrix && !s->rematrix
&& s->engine != SWR_ENGINE_SOXR){ && s->engine != SWR_ENGINE_SOXR){
s->int_sample_fmt= AV_SAMPLE_FMT_S32P; s->int_sample_fmt= AV_SAMPLE_FMT_S32P;
}else if(av_get_planar_sample_fmt(s->in_sample_fmt) <= AV_SAMPLE_FMT_FLTP){ }else if(av_get_bytes_per_sample(s->in_sample_fmt) <= 4){
s->int_sample_fmt= AV_SAMPLE_FMT_FLTP; s->int_sample_fmt= AV_SAMPLE_FMT_FLTP;
}else{ }else{
s->int_sample_fmt= AV_SAMPLE_FMT_DBLP; s->int_sample_fmt= AV_SAMPLE_FMT_DBLP;