Commit bb3823d4 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'a2816230'

* commit 'a2816230':
  avframe: call release_buffer only if it is set

Conflicts:
	libavcodec/utils.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 8ded1718 a2816230
...@@ -669,7 +669,8 @@ typedef struct CompatReleaseBufPriv { ...@@ -669,7 +669,8 @@ typedef struct CompatReleaseBufPriv {
static void compat_free_buffer(void *opaque, uint8_t *data) static void compat_free_buffer(void *opaque, uint8_t *data)
{ {
CompatReleaseBufPriv *priv = opaque; CompatReleaseBufPriv *priv = opaque;
priv->avctx.release_buffer(&priv->avctx, &priv->frame); if (priv->avctx.release_buffer)
priv->avctx.release_buffer(&priv->avctx, &priv->frame);
av_freep(&priv); av_freep(&priv);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment