diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-06 18:16:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-06 18:17:33 +0100 |
| commit | ad0cf8e063b846cd3653875a1b88c7469fd257a1 (patch) | |
| tree | eea4af7775f82075236f0f6ba0bfd1393d2c3db4 /libavcodec/pthread_frame.c | |
| parent | f663734738c04211e1326829724c844377a257ee (diff) | |
| parent | ac4a5e3abd8a022ab32245ad527ffc37eabab8b1 (diff) | |
Merge commit 'ac4a5e3abd8a022ab32245ad527ffc37eabab8b1'
* commit 'ac4a5e3abd8a022ab32245ad527ffc37eabab8b1':
pthreads_frame: Do not leak on failure path
See: 11679e1b90f6e52a3643efb45d06ea5adf65098a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pthread_frame.c')
| -rw-r--r-- | libavcodec/pthread_frame.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index fa1c50a982..5a4ab84a4a 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -651,8 +651,8 @@ int ff_frame_thread_init(AVCodecContext *avctx) p->frame = av_frame_alloc(); if (!p->frame) { - err = AVERROR(ENOMEM); av_freep(©); + err = AVERROR(ENOMEM); goto error; } |