Merge commit '283226e11ccf50a71d25d150fbbf1743f74c6c49'
authorClément Bœsch <u@pkh.me>
Tue, 21 Jun 2016 20:12:36 +0000 (22:12 +0200)
committerClément Bœsch <u@pkh.me>
Tue, 21 Jun 2016 20:12:36 +0000 (22:12 +0200)
commit363d4a0e65a7240114022ce03cf656e6e29cb181
treef6aae35d1b7c82f8fecab2b1206078fba52f4924
parente276f21f995c147712005267f47cdcdae0d31dce
parent283226e11ccf50a71d25d150fbbf1743f74c6c49
Merge commit '283226e11ccf50a71d25d150fbbf1743f74c6c49'

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

See 5df703aa1b03814e9cd216ab703501481166b3bb

Merged-by: Clément Bœsch <u@pkh.me>
libavcodec/simple_idct_template.c