diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 13:45:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 13:45:50 +0100 |
| commit | bb3823d457104d883a81ee332a005ad42e80409f (patch) | |
| tree | d87a2106ee62fb35957c1300c138a380b7425729 | |
| parent | 8ded1718bdf5ad0309a33a57e10b06a51139138d (diff) | |
| parent | a2816230c5c0a8fc72bc0163b7d21a96b194d87a (diff) | |
| download | ffmpeg-bb3823d457104d883a81ee332a005ad42e80409f.tar.gz | |
Merge commit 'a2816230c5c0a8fc72bc0163b7d21a96b194d87a'
* commit 'a2816230c5c0a8fc72bc0163b7d21a96b194d87a':
avframe: call release_buffer only if it is set
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/utils.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 13f8d0f231..4ed64c967e 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -669,7 +669,8 @@ typedef struct CompatReleaseBufPriv { static void compat_free_buffer(void *opaque, uint8_t *data) { 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); } |