ffmpeg | branch: master | Hendrik Leppkes <h.lepp...@gmail.com> | Mon Nov 14 15:21:49 2016 +0100| [51f5542c776ae89b56d77522fdd2bafde32695b0] | committer: Hendrik Leppkes
Merge commit 'e8b96a77010dd62624c3c65c357d7ae3b397ceaa' * commit 'e8b96a77010dd62624c3c65c357d7ae3b397ceaa': arm: Fix a typo in a comment Merged-by: Hendrik Leppkes <h.lepp...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=51f5542c776ae89b56d77522fdd2bafde32695b0 --- libavcodec/arm/vp8dsp_armv6.S | 2 +- libavcodec/arm/vp8dsp_neon.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/arm/vp8dsp_armv6.S b/libavcodec/arm/vp8dsp_armv6.S index 1adcbbd..f1ec6ee 100644 --- a/libavcodec/arm/vp8dsp_armv6.S +++ b/libavcodec/arm/vp8dsp_armv6.S @@ -1181,7 +1181,7 @@ function ff_put_vp8_pixels4_armv6, export=1 endfunc @ note: worst case sum of all 6-tap filter values * 255 is 0x7f80 so 16 bit -@ arithmatic can be used to apply filters +@ arithmetic can be used to apply filters const sixtap_filters_13245600, align=4 .short 2, 108, -11, 36, -8, 1, 0, 0 .short 3, 77, -16, 77, -16, 3, 0, 0 diff --git a/libavcodec/arm/vp8dsp_neon.S b/libavcodec/arm/vp8dsp_neon.S index 2e87fb0..fcb4248 100644 --- a/libavcodec/arm/vp8dsp_neon.S +++ b/libavcodec/arm/vp8dsp_neon.S @@ -1562,7 +1562,7 @@ function ff_put_vp8_epel4_h4v4_neon, export=1 endfunc @ note: worst case sum of all 6-tap filter values * 255 is 0x7f80 so 16 bit -@ arithmatic can be used to apply filters +@ arithmetic can be used to apply filters const subpel_filters, align=4 .short 0, 6, 123, 12, 1, 0, 0, 0 .short 2, 11, 108, 36, 8, 1, 0, 0 ====================================================================== _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
