aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-01 19:27:00 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-01 20:00:10 +0100
commitc77cc2c1766666cdb5f14daee0f75e397bf7a194 (patch)
tree89632c74fdcc23cf79028e68a36d9c1f040df0d2
parent2929e560061312e564a33aed4727283cbb48b102 (diff)
downloadffmpeg-c77cc2c1766666cdb5f14daee0f75e397bf7a194.tar.gz
swresample/dither: Cleanup number suffixes
The <<31 case needs LL Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libswresample/dither.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libswresample/dither.c b/libswresample/dither.c
index b8b592a7ce..8121f11c2f 100644
--- a/libswresample/dither.c
+++ b/libswresample/dither.c
@@ -84,14 +84,14 @@ int swri_dither_init(SwrContext *s, enum AVSampleFormat out_fmt, enum AVSampleFo
in_fmt = av_get_packed_sample_fmt( in_fmt);
if(in_fmt == AV_SAMPLE_FMT_FLT || in_fmt == AV_SAMPLE_FMT_DBL){
- if(out_fmt == AV_SAMPLE_FMT_S32) scale = 1.0/(1L<<31);
- if(out_fmt == AV_SAMPLE_FMT_S16) scale = 1.0/(1L<<15);
- if(out_fmt == AV_SAMPLE_FMT_U8 ) scale = 1.0/(1L<< 7);
+ if(out_fmt == AV_SAMPLE_FMT_S32) scale = 1.0/(1LL<<31);
+ if(out_fmt == AV_SAMPLE_FMT_S16) scale = 1.0/(1LL<<15);
+ if(out_fmt == AV_SAMPLE_FMT_U8 ) scale = 1.0/(1LL<< 7);
}
if(in_fmt == AV_SAMPLE_FMT_S32 && out_fmt == AV_SAMPLE_FMT_S32 && (s->dither.output_sample_bits&31)) scale = 1;
- if(in_fmt == AV_SAMPLE_FMT_S32 && out_fmt == AV_SAMPLE_FMT_S16) scale = 1L<<16;
- if(in_fmt == AV_SAMPLE_FMT_S32 && out_fmt == AV_SAMPLE_FMT_U8 ) scale = 1L<<24;
- if(in_fmt == AV_SAMPLE_FMT_S16 && out_fmt == AV_SAMPLE_FMT_U8 ) scale = 1L<<8;
+ if(in_fmt == AV_SAMPLE_FMT_S32 && out_fmt == AV_SAMPLE_FMT_S16) scale = 1<<16;
+ if(in_fmt == AV_SAMPLE_FMT_S32 && out_fmt == AV_SAMPLE_FMT_U8 ) scale = 1<<24;
+ if(in_fmt == AV_SAMPLE_FMT_S16 && out_fmt == AV_SAMPLE_FMT_U8 ) scale = 1<<8;
scale *= s->dither.scale;