Merge commit '9b30f8dd8fa5bef5f16904cb98745b4a58f8f776'

[ffmpeg] / libavcodec / h264_ps.c

diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c
index 0bca9c1a808b2068518c2ca2cb845bdadbb09a26..515eb8a7600f51f06c064f4fae06bdae1f767af8 100644 (file)
--- a/libavcodec/h264_ps.c
+++ b/libavcodec/h264_ps.c
@@ -29,6 +29,7 @@
 
 #include "libavutil/imgutils.h"
 #include "internal.h"
+#include "mathops.h"
 #include "avcodec.h"
 #include "h264.h"
 #include "h264data.h"
@@ -272,7 +273,7 @@ static void decode_scaling_list(H264Context *h, uint8_t *factors, int size,
                                 const uint8_t *fallback_list)
 {
     int i, last = 8, next = 8;
-    const uint8_t *scan = size == 16 ? zigzag_scan : ff_zigzag_direct;
+    const uint8_t *scan = size == 16 ? ff_zigzag_scan : ff_zigzag_direct;
     if (!get_bits1(&h->gb)) /* matrix not written, we use the predicted one */
         memcpy(factors, fallback_list, size * sizeof(uint8_t));
     else