Merge commit 'db21dde3f72c2331653399bdb8745350f015d847'

[ffmpeg] / libavcodec / libstagefright.cpp

diff --git a/libavcodec/libstagefright.cpp b/libavcodec/libstagefright.cpp
index 11d60387759a6f8c4b8ac633fe453e6be833e12f..f4b38e60705fb327203e4c2a42043df2e94af334 100644 (file)
--- a/libavcodec/libstagefright.cpp
+++ b/libavcodec/libstagefright.cpp
@@ -272,7 +272,7 @@ static av_cold int Stagefright_init(AVCodecContext *avctx)
 
     s->orig_extradata_size = avctx->extradata_size;
     s->orig_extradata = (uint8_t*) av_mallocz(avctx->extradata_size +
-                                              FF_INPUT_BUFFER_PADDING_SIZE);
+                                              AV_INPUT_BUFFER_PADDING_SIZE);
     if (!s->orig_extradata) {
         ret = AVERROR(ENOMEM);
         goto fail;
@@ -568,7 +568,7 @@ AVCodec ff_libstagefright_h264_decoder = {
     NULL_IF_CONFIG_SMALL("libstagefright H.264"),
     AVMEDIA_TYPE_VIDEO,
     AV_CODEC_ID_H264,
-    CODEC_CAP_DELAY,
+    AV_CODEC_CAP_DELAY,
     NULL, //supported_framerates
     NULL, //pix_fmts
     NULL, //supported_samplerates