diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-04-27 19:15:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-27 19:15:26 +0200 |
| commit | c75dae3ed21bfa5a8ae46cd83d18329af5bea05a (patch) | |
| tree | ef657c38feb2368a3c86765778d1f068aa5eb614 /media/ffvpx/libavcodec/flacdsp_template.c | |
| parent | c82c6d960a7f19d6595171f9705c43514f20c1ec (diff) | |
| parent | 6ada4b14e4cfc91f5f1b2556623cab691f3ab813 (diff) | |
| download | UXP-c75dae3ed21bfa5a8ae46cd83d18329af5bea05a.tar UXP-c75dae3ed21bfa5a8ae46cd83d18329af5bea05a.tar.gz UXP-c75dae3ed21bfa5a8ae46cd83d18329af5bea05a.tar.lz UXP-c75dae3ed21bfa5a8ae46cd83d18329af5bea05a.tar.xz UXP-c75dae3ed21bfa5a8ae46cd83d18329af5bea05a.zip | |
Merge pull request #275 from trav90/ffvpx-resync
Resync ffvpx code with 3.4.2-release from upstream
Diffstat (limited to 'media/ffvpx/libavcodec/flacdsp_template.c')
| -rw-r--r-- | media/ffvpx/libavcodec/flacdsp_template.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/ffvpx/libavcodec/flacdsp_template.c b/media/ffvpx/libavcodec/flacdsp_template.c index 62c0a15ff..776c78da7 100644 --- a/media/ffvpx/libavcodec/flacdsp_template.c +++ b/media/ffvpx/libavcodec/flacdsp_template.c @@ -56,7 +56,7 @@ static void FUNC(flac_decorrelate_indep_c)(uint8_t **out, int32_t **in, for (j = 0; j < len; j++) for (i = 0; i < channels; i++) - S(samples, i, j) = in[i][j] << shift; + S(samples, i, j) = (int)((unsigned)in[i][j] << shift); } static void FUNC(flac_decorrelate_ls_c)(uint8_t **out, int32_t **in, |