ffmpeg | branch: release/1.2 | Michael Niedermayer <michae...@gmx.at> | Sun Feb
1 19:27:00 2015 +0100| [0e79fd1ec9259899217002993daf63d4c5b549d0] | committer:
Michael Niedermayer
swresample/dither: Cleanup number suffixes
The <<31 case needs LL
Signed-off-by: Michael Niedermayer <michae...@gmx.at>
(cherry picked from commit c77cc2c1766666cdb5f14daee0f75e397bf7a194)
Conflicts:
libswresample/dither.c
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0e79fd1ec9259899217002993daf63d4c5b549d0
---
libswresample/dither.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/libswresample/dither.c b/libswresample/dither.c
index ce8581c..ff08208 100644
--- a/libswresample/dither.c
+++ b/libswresample/dither.c
@@ -84,13 +84,13 @@ 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_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;
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
