x86: hpel: Move {avg,put}_pixels16_sse2 to hpeldsp

[ffmpeg] / libavcodec / assdec.c

diff --git a/libavcodec/assdec.c b/libavcodec/assdec.c
index 2d82ca6ef7fffcebd0851e1c5f8eafcac0435c1a..7a69582aa22810910081aa21dbd5731fa570a9a6 100644 (file)
--- a/libavcodec/assdec.c
+++ b/libavcodec/assdec.c
@@ -19,8 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <string.h>
+
 #include "avcodec.h"
 #include "ass.h"
+#include "libavutil/internal.h"
+#include "libavutil/mem.h"
 
 static av_cold int ass_decode_init(AVCodecContext *avctx)
 {
@@ -56,7 +60,7 @@ AVCodec ff_ass_decoder = {
     .name         = "ass",
     .long_name    = NULL_IF_CONFIG_SMALL("SSA (SubStation Alpha) subtitle"),
     .type         = AVMEDIA_TYPE_SUBTITLE,
-    .id           = CODEC_ID_SSA,
+    .id           = AV_CODEC_ID_SSA,
     .init         = ass_decode_init,
     .decode       = ass_decode_frame,
 };