[FFmpeg-cvslog] Merge commit '283226e11ccf50a71d25d150fbbf1743f74c6c49'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Tue Jun 21 22:12:36 2016 +0200| [363d4a0e65a7240114022ce03cf656e6e29cb181] | committer: Clément Bœsch

Merge commit '283226e11ccf50a71d25d150fbbf1743f74c6c49'

* commit '283226e11ccf50a71d25d150fbbf1743f74c6c49':
  simple_idct_template: Fix strict aliasing violation

See 5df703aa1b03814e9cd216ab703501481166b3bb

Merged-by: Clément Bœsch <u at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=363d4a0e65a7240114022ce03cf656e6e29cb181
---

 libavcodec/simple_idct_template.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/simple_idct_template.c b/libavcodec/simple_idct_template.c
index b73614b..f5744e0 100644
--- a/libavcodec/simple_idct_template.c
+++ b/libavcodec/simple_idct_template.c
@@ -126,7 +126,7 @@ static inline void FUNC(idctRowCondDC)(int16_t *row, int extra_shift)
         temp += temp * (1 << 16);
         temp += temp * ((uint64_t) 1 << 32);
         AV_WN64A(row, temp);
-        AV_WN64A(row+4, temp);
+        AV_WN64A(row + 4, temp);
         return;
     }
 #else


======================================================================