]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit 'e8b96a77010dd62624c3c65c357d7ae3b397ceaa'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 14 Nov 2016 14:21:49 +0000 (15:21 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 14 Nov 2016 14:21:49 +0000 (15:21 +0100)
* commit 'e8b96a77010dd62624c3c65c357d7ae3b397ceaa':
  arm: Fix a typo in a comment

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavcodec/arm/vp8dsp_armv6.S
libavcodec/arm/vp8dsp_neon.S

Simple merge
Simple merge