From 5b9c3b4505206143d85398c1410949319fa1180f Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 9 Nov 2013 10:05:22 +0100 Subject: Replace all instances of avcodec_alloc_frame() with av_frame_alloc(). --- libavcodec/alacenc.c | 2 +- libavcodec/api-example.c | 8 ++++---- libavcodec/libopenjpegenc.c | 2 +- libavcodec/libtheoraenc.c | 2 +- libavcodec/libvpxenc.c | 2 +- libavcodec/pcm.c | 2 +- libavcodec/proresenc.c | 2 +- libavcodec/svq1dec.c | 2 +- libavcodec/utils.c | 2 +- libavcodec/utvideoenc.c | 2 +- libavcodec/v210enc.c | 2 +- libavcodec/v410enc.c | 2 +- libavcodec/xbmenc.c | 2 +- libavcodec/xwdenc.c | 2 +- 14 files changed, 17 insertions(+), 17 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/alacenc.c b/libavcodec/alacenc.c index 5fbcbfcd14..401f26f66c 100644 --- a/libavcodec/alacenc.c +++ b/libavcodec/alacenc.c @@ -579,7 +579,7 @@ static av_cold int alac_encode_init(AVCodecContext *avctx) goto error; } - avctx->coded_frame = avcodec_alloc_frame(); + avctx->coded_frame = av_frame_alloc(); if (!avctx->coded_frame) { ret = AVERROR(ENOMEM); goto error; diff --git a/libavcodec/api-example.c b/libavcodec/api-example.c index 25b7cfe2a6..54a1ecaa3c 100644 --- a/libavcodec/api-example.c +++ b/libavcodec/api-example.c @@ -155,7 +155,7 @@ static void audio_encode_example(const char *filename) } /* frame containing input raw audio */ - frame = avcodec_alloc_frame(); + frame = av_frame_alloc(); if (!frame) { fprintf(stderr, "could not allocate audio frame\n"); exit(1); @@ -268,7 +268,7 @@ static void audio_decode_example(const char *outfilename, const char *filename) int got_frame = 0; if (!decoded_frame) { - if (!(decoded_frame = avcodec_alloc_frame())) { + if (!(decoded_frame = av_frame_alloc())) { fprintf(stderr, "out of memory\n"); exit(1); } @@ -334,7 +334,7 @@ static void video_encode_example(const char *filename) } c = avcodec_alloc_context3(codec); - picture= avcodec_alloc_frame(); + picture = av_frame_alloc(); /* put sample parameters */ c->bit_rate = 400000; @@ -479,7 +479,7 @@ static void video_decode_example(const char *outfilename, const char *filename) } c = avcodec_alloc_context3(codec); - picture= avcodec_alloc_frame(); + picture = av_frame_alloc(); if(codec->capabilities&CODEC_CAP_TRUNCATED) c->flags|= CODEC_FLAG_TRUNCATED; /* we do not send complete frames */ diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c index f2f98cd2c2..b84e6a4e31 100644 --- a/libavcodec/libopenjpegenc.c +++ b/libavcodec/libopenjpegenc.c @@ -168,7 +168,7 @@ static av_cold int libopenjpeg_encode_init(AVCodecContext *avctx) return AVERROR(ENOMEM); } - avctx->coded_frame = avcodec_alloc_frame(); + avctx->coded_frame = av_frame_alloc(); if (!avctx->coded_frame) { av_log(avctx, AV_LOG_ERROR, "Error allocating coded frame\n"); goto fail; diff --git a/libavcodec/libtheoraenc.c b/libavcodec/libtheoraenc.c index b88566466e..9041a27df0 100644 --- a/libavcodec/libtheoraenc.c +++ b/libavcodec/libtheoraenc.c @@ -259,7 +259,7 @@ static av_cold int encode_init(AVCodecContext* avc_context) th_comment_clear(&t_comment); /* Set up the output AVFrame */ - avc_context->coded_frame= avcodec_alloc_frame(); + avc_context->coded_frame = av_frame_alloc(); return 0; } diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index d5c4fe15ce..9996afc74c 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -353,7 +353,7 @@ static av_cold int vpx_init(AVCodecContext *avctx, vpx_img_wrap(&ctx->rawimg, VPX_IMG_FMT_I420, avctx->width, avctx->height, 1, (unsigned char*)1); - avctx->coded_frame = avcodec_alloc_frame(); + avctx->coded_frame = av_frame_alloc(); if (!avctx->coded_frame) { av_log(avctx, AV_LOG_ERROR, "Error allocating coded frame\n"); vp8_free(avctx); diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c index 882c167614..9fadcb7b86 100644 --- a/libavcodec/pcm.c +++ b/libavcodec/pcm.c @@ -48,7 +48,7 @@ static av_cold int pcm_encode_init(AVCodecContext *avctx) avctx->bits_per_coded_sample = av_get_bits_per_sample(avctx->codec->id); avctx->block_align = avctx->channels * avctx->bits_per_coded_sample / 8; avctx->bit_rate = avctx->block_align * avctx->sample_rate * 8; - avctx->coded_frame = avcodec_alloc_frame(); + avctx->coded_frame = av_frame_alloc(); if (!avctx->coded_frame) return AVERROR(ENOMEM); diff --git a/libavcodec/proresenc.c b/libavcodec/proresenc.c index 758b8e3a54..7e9ce541b6 100644 --- a/libavcodec/proresenc.c +++ b/libavcodec/proresenc.c @@ -1075,7 +1075,7 @@ static av_cold int encode_init(AVCodecContext *avctx) int interlaced = !!(avctx->flags & CODEC_FLAG_INTERLACED_DCT); avctx->bits_per_raw_sample = 10; - avctx->coded_frame = avcodec_alloc_frame(); + avctx->coded_frame = av_frame_alloc(); if (!avctx->coded_frame) return AVERROR(ENOMEM); diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c index 3b1a275bf4..000487b197 100644 --- a/libavcodec/svq1dec.c +++ b/libavcodec/svq1dec.c @@ -742,7 +742,7 @@ static av_cold int svq1_decode_init(AVCodecContext *avctx) int i; int offset = 0; - s->prev = avcodec_alloc_frame(); + s->prev = av_frame_alloc(); if (!s->prev) return AVERROR(ENOMEM); diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 23165f4f43..da50e4268c 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1125,7 +1125,7 @@ static int pad_last_frame(AVCodecContext *s, AVFrame **dst, const AVFrame *src) AVFrame *frame = NULL; int ret; - if (!(frame = avcodec_alloc_frame())) + if (!(frame = av_frame_alloc())) return AVERROR(ENOMEM); frame->format = src->format; diff --git a/libavcodec/utvideoenc.c b/libavcodec/utvideoenc.c index 36ac335e19..dd8d07ebf8 100644 --- a/libavcodec/utvideoenc.c +++ b/libavcodec/utvideoenc.c @@ -126,7 +126,7 @@ static av_cold int utvideo_encode_init(AVCodecContext *avctx) return AVERROR_OPTION_NOT_FOUND; } - avctx->coded_frame = avcodec_alloc_frame(); + avctx->coded_frame = av_frame_alloc(); if (!avctx->coded_frame) { av_log(avctx, AV_LOG_ERROR, "Could not allocate frame.\n"); diff --git a/libavcodec/v210enc.c b/libavcodec/v210enc.c index 7efbb9607c..ef0d6ab2a4 100644 --- a/libavcodec/v210enc.c +++ b/libavcodec/v210enc.c @@ -36,7 +36,7 @@ static av_cold int encode_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_WARNING, "bits per raw sample: %d != 10-bit\n", avctx->bits_per_raw_sample); - avctx->coded_frame = avcodec_alloc_frame(); + avctx->coded_frame = av_frame_alloc(); if (!avctx->coded_frame) return AVERROR(ENOMEM); diff --git a/libavcodec/v410enc.c b/libavcodec/v410enc.c index 91cd823bb8..77b32d7ab6 100644 --- a/libavcodec/v410enc.c +++ b/libavcodec/v410enc.c @@ -32,7 +32,7 @@ static av_cold int v410_encode_init(AVCodecContext *avctx) return AVERROR_INVALIDDATA; } - avctx->coded_frame = avcodec_alloc_frame(); + avctx->coded_frame = av_frame_alloc(); if (!avctx->coded_frame) { av_log(avctx, AV_LOG_ERROR, "Could not allocate frame.\n"); diff --git a/libavcodec/xbmenc.c b/libavcodec/xbmenc.c index 8616372aa9..d6657dcd08 100644 --- a/libavcodec/xbmenc.c +++ b/libavcodec/xbmenc.c @@ -26,7 +26,7 @@ static av_cold int xbm_encode_init(AVCodecContext *avctx) { - avctx->coded_frame = avcodec_alloc_frame(); + avctx->coded_frame = av_frame_alloc(); if (!avctx->coded_frame) return AVERROR(ENOMEM); avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; diff --git a/libavcodec/xwdenc.c b/libavcodec/xwdenc.c index 87d6cff11b..54599a08a1 100644 --- a/libavcodec/xwdenc.c +++ b/libavcodec/xwdenc.c @@ -32,7 +32,7 @@ static av_cold int xwd_encode_init(AVCodecContext *avctx) { - avctx->coded_frame = avcodec_alloc_frame(); + avctx->coded_frame = av_frame_alloc(); if (!avctx->coded_frame) return AVERROR(ENOMEM); -- cgit v1.2.3