Merge commit '5d8bea3bb2357bb304f8f771a4107039037c5549'

[ffmpeg] / libavcodec / dss_sp.c

diff --git a/libavcodec/dss_sp.c b/libavcodec/dss_sp.c
index 909ad1f2e01abe7062949cdc73e07cfc2371c94b..7cf84899fc5b8d2f4db1398d89b849871800802e 100644 (file)
--- a/libavcodec/dss_sp.c
+++ b/libavcodec/dss_sp.c
@@ -66,7 +66,7 @@ typedef struct DssSpContext {
     int pulse_dec_mode;
 
     DECLARE_ALIGNED(16, uint8_t, bits)[DSS_SP_FRAME_SIZE +
-                                       FF_INPUT_BUFFER_PADDING_SIZE];
+                                       AV_INPUT_BUFFER_PADDING_SIZE];
 } DssSpContext;
 
 /*
@@ -783,5 +783,5 @@ AVCodec ff_dss_sp_decoder = {
     .priv_data_size = sizeof(DssSpContext),
     .init           = dss_sp_decode_init,
     .decode         = dss_sp_decode_frame,
-    .capabilities   = CODEC_CAP_DR1,
+    .capabilities   = AV_CODEC_CAP_DR1,
 };