[FFmpeg-cvslog] Merge commit '6be7944ee2ec2f045e6eb9a93237e992c8b20ac4'

James Almer git at videolan.org
Thu Mar 23 23:06:24 EET 2017


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Mar 23 18:05:27 2017 -0300| [29db87af522c22c74be1689fb8c71bf1872482c8] | committer: James Almer

Merge commit '6be7944ee2ec2f045e6eb9a93237e992c8b20ac4'

* commit '6be7944ee2ec2f045e6eb9a93237e992c8b20ac4':
  x86: Add missing colons after assembly labels

Merged-by: James Almer <jamrial at gmail.com>

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

 libavcodec/x86/audiodsp.asm | 2 +-
 libavutil/x86/imgutils.asm  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/x86/audiodsp.asm b/libavcodec/x86/audiodsp.asm
index a44e064..3973808 100644
--- a/libavcodec/x86/audiodsp.asm
+++ b/libavcodec/x86/audiodsp.asm
@@ -150,7 +150,7 @@ cglobal vector_clipf, 3, 3, 6, dst, src, len, min, max
 
     movsxdifnidn lenq, lend
 
-.loop
+.loop:
     mova m2, [srcq + 4 * lenq - 4 * mmsize]
     mova m3, [srcq + 4 * lenq - 3 * mmsize]
     mova m4, [srcq + 4 * lenq - 2 * mmsize]
diff --git a/libavutil/x86/imgutils.asm b/libavutil/x86/imgutils.asm
index f5ebc0f..3cca56c 100644
--- a/libavutil/x86/imgutils.asm
+++ b/libavutil/x86/imgutils.asm
@@ -28,10 +28,10 @@ cglobal image_copy_plane_uc_from, 6, 7, 4, dst, dst_linesize, src, src_linesize,
     add srcq, bwq
     neg bwq
 
-.row_start
+.row_start:
     mov rowposq, bwq
 
-.loop
+.loop:
     movntdqa m0, [srcq + rowposq + 0 * mmsize]
     movntdqa m1, [srcq + rowposq + 1 * mmsize]
     movntdqa m2, [srcq + rowposq + 2 * mmsize]


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




More information about the ffmpeg-cvslog mailing list