summaryrefslogtreecommitdiff
path: root/avconv.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2013-11-09 10:05:22 +0100
committerAnton Khirnov <anton@khirnov.net>2013-11-16 12:44:20 +0100
commit5b9c3b4505206143d85398c1410949319fa1180f (patch)
treee947d3ad720f3442712d5bf8d59e073243b75f04 /avconv.c
parent2ff302cb6ba1f159905888026c8a1d7dd8319acf (diff)
Replace all instances of avcodec_alloc_frame() with av_frame_alloc().
Diffstat (limited to 'avconv.c')
-rw-r--r--avconv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/avconv.c b/avconv.c
index 8d8c802f56..1e8c25eef2 100644
--- a/avconv.c
+++ b/avconv.c
@@ -637,7 +637,7 @@ static int poll_filter(OutputStream *ost)
AVFrame *filtered_frame = NULL;
int frame_size, ret;
- if (!ost->filtered_frame && !(ost->filtered_frame = avcodec_alloc_frame())) {
+ if (!ost->filtered_frame && !(ost->filtered_frame = av_frame_alloc())) {
return AVERROR(ENOMEM);
} else
avcodec_get_frame_defaults(ost->filtered_frame);
@@ -1056,7 +1056,7 @@ static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output)
AVCodecContext *avctx = ist->st->codec;
int i, ret, err = 0, resample_changed;
- if (!ist->decoded_frame && !(ist->decoded_frame = avcodec_alloc_frame()))
+ if (!ist->decoded_frame && !(ist->decoded_frame = av_frame_alloc()))
return AVERROR(ENOMEM);
if (!ist->filter_frame && !(ist->filter_frame = av_frame_alloc()))
return AVERROR(ENOMEM);