sgidec: stop using deprecated avcodec_set_dimensions

[ffmpeg] / libavcodec / x86 / proresdsp.asm

diff --git a/libavcodec/x86/proresdsp.asm b/libavcodec/x86/proresdsp.asm
index 70fd6862a38bde749f12cd3a9e930b8d29059fe4..855f2094b79afd5d1f2e3a9c535bc65d24f5518d 100644 (file)
--- a/libavcodec/x86/proresdsp.asm
+++ b/libavcodec/x86/proresdsp.asm
@@ -21,8 +21,7 @@
 ;* 51, Inc., Foundation Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;******************************************************************************
 
-%include "x86inc.asm"
-%include "x86util.asm"
+%include "libavutil/x86/x86util.asm"
 
 %define W1sh2 22725 ; W1 = 90901 = 22725<<2 + 1
 %define W2sh2 21407 ; W2 = 85627 = 21407<<2 - 1
@@ -328,7 +327,7 @@ section .text align=16
 %endmacro
 
 ; void prores_idct_put_10_<opt>(uint8_t *pixels, int stride,
-;                               DCTELEM *block, const int16_t *qmat);
+;                               int16_t *block, const int16_t *qmat);
 %macro idct_put_fn 1
 cglobal prores_idct_put_10, 4, 4, %1
     movsxd      r1,  r1d
@@ -405,12 +404,12 @@ cglobal prores_idct_put_10, 4, 4, %1
     RET
 %endmacro
 
-%macro SIGNEXTEND 2-3 ; dstlow, dsthigh, tmp
-%if cpuflag(sse4)
+%macro SIGNEXTEND 2-3
+%if cpuflag(sse4) ; dstlow, dsthigh
     movhlps     %2,  %1
     pmovsxwd    %1,  %1
     pmovsxwd    %2,  %2
-%else ; sse2
+%elif cpuflag(sse2) ; dstlow, dsthigh, tmp
     pxor        %3,  %3
     pcmpgtw     %3,  %1
     mova        %2,  %1