[FFmpeg-cvslog] Merge commit '3c504bc3599f00bfc5923adc114beef34bce11d0'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Mar 15 22:07:28 2017 -0300| [e632fe9babe95478a14bde0b67bb5b0c9ba67aea] | committer: James Almer

Merge commit '3c504bc3599f00bfc5923adc114beef34bce11d0'

* commit '3c504bc3599f00bfc5923adc114beef34bce11d0':
  x86: deduplicate some constants

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

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

 libavcodec/x86/constants.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/x86/constants.h b/libavcodec/x86/constants.h
index b82aef9..bbb0ef8 100644
--- a/libavcodec/x86/constants.h
+++ b/libavcodec/x86/constants.h
@@ -43,6 +43,7 @@ extern const xmm_reg  ff_pw_64;
 extern const uint64_t ff_pw_96;
 extern const uint64_t ff_pw_128;
 extern const ymm_reg  ff_pw_255;
+extern const ymm_reg  ff_pw_256;
 extern const ymm_reg  ff_pw_512;
 extern const ymm_reg  ff_pw_1023;
 extern const ymm_reg  ff_pw_1024;


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

diff --cc libavcodec/x86/constants.h
index b82aef9,c3b8d50..bbb0ef8
--- a/libavcodec/x86/constants.h
+++ b/libavcodec/x86/constants.h
@@@ -42,30 -41,14 +42,31 @@@ extern const uint64_t ff_pw_53
  extern const xmm_reg  ff_pw_64;
  extern const uint64_t ff_pw_96;
  extern const uint64_t ff_pw_128;
 -extern const uint64_t ff_pw_255;
 -extern const xmm_reg  ff_pw_256;
 -extern const xmm_reg  ff_pw_512;
 -extern const xmm_reg  ff_pw_m1;
 -
 -extern const xmm_reg  ff_pb_1;
 -extern const xmm_reg  ff_pb_3;
 -extern const xmm_reg  ff_pb_F8;
 +extern const ymm_reg  ff_pw_255;
++extern const ymm_reg  ff_pw_256;
 +extern const ymm_reg  ff_pw_512;
 +extern const ymm_reg  ff_pw_1023;
 +extern const ymm_reg  ff_pw_1024;
 +extern const ymm_reg  ff_pw_2048;
 +extern const ymm_reg  ff_pw_4095;
 +extern const ymm_reg  ff_pw_4096;
 +extern const ymm_reg  ff_pw_8192;
 +extern const ymm_reg  ff_pw_m1;
 +
 +extern const ymm_reg  ff_pb_0;
 +extern const ymm_reg  ff_pb_1;
 +extern const ymm_reg  ff_pb_2;
 +extern const ymm_reg  ff_pb_3;
 +extern const xmm_reg  ff_pb_80;
 +extern const ymm_reg  ff_pb_FE;
  extern const uint64_t ff_pb_FC;
  
 +extern const xmm_reg  ff_ps_neg;
 +
 +extern const ymm_reg  ff_pd_1;
 +extern const ymm_reg  ff_pd_16;
 +extern const ymm_reg  ff_pd_32;
 +extern const ymm_reg  ff_pd_8192;
 +extern const ymm_reg  ff_pd_65535;
 +
  #endif /* AVCODEC_X86_CONSTANTS_H */