diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-16 23:48:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-16 23:54:10 +0100 |
| commit | 0ee905e243078cd4dfb3afa32777129aeee3bddb (patch) | |
| tree | 78bafb0b5626836d18d158139b71d0e6b73780a2 /libavfilter | |
| parent | 571a99de186eac69ed0d6b0eaaaa983cae30765a (diff) | |
| parent | 5b9c3b4505206143d85398c1410949319fa1180f (diff) | |
Merge commit '5b9c3b4505206143d85398c1410949319fa1180f'
* commit '5b9c3b4505206143d85398c1410949319fa1180f':
Replace all instances of avcodec_alloc_frame() with av_frame_alloc().
Conflicts:
doc/examples/decoding_encoding.c
doc/examples/muxing.c
ffmpeg.c
libavcodec/alacenc.c
libavcodec/libopenjpegenc.c
libavcodec/libvpxenc.c
libavcodec/pcm.c
libavcodec/xbmenc.c
libavcodec/xwdenc.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/lavfutils.c | 2 | ||||
| -rw-r--r-- | libavfilter/libmpcodecs/vf_uspp.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavfilter/lavfutils.c b/libavfilter/lavfutils.c index b7a103b66c..58d98cfdb6 100644 --- a/libavfilter/lavfutils.c +++ b/libavfilter/lavfutils.c @@ -57,7 +57,7 @@ int ff_load_image(uint8_t *data[4], int linesize[4], goto end; } - if (!(frame = avcodec_alloc_frame()) ) { + if (!(frame = av_frame_alloc()) ) { av_log(log_ctx, AV_LOG_ERROR, "Failed to alloc frame\n"); ret = AVERROR(ENOMEM); goto end; diff --git a/libavfilter/libmpcodecs/vf_uspp.c b/libavfilter/libmpcodecs/vf_uspp.c index 54cc0f9e11..1fb252386c 100644 --- a/libavfilter/libmpcodecs/vf_uspp.c +++ b/libavfilter/libmpcodecs/vf_uspp.c @@ -245,8 +245,8 @@ static int config(struct vf_instance *vf, av_dict_free(&opts); assert(avctx_enc->codec); } - vf->priv->frame= avcodec_alloc_frame(); - vf->priv->frame_dec= avcodec_alloc_frame(); + vf->priv->frame= av_frame_alloc(); + vf->priv->frame_dec= av_frame_alloc(); vf->priv->outbuf_size= (width + BLOCK)*(height + BLOCK)*10; vf->priv->outbuf= malloc(vf->priv->outbuf_size); |