1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00

Merge commit 'ac4a5e3abd8a022ab32245ad527ffc37eabab8b1'

* commit 'ac4a5e3abd8a022ab32245ad527ffc37eabab8b1':
  pthreads_frame: Do not leak on failure path

See: 11679e1b90
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-11-06 18:16:38 +01:00
commit ad0cf8e063

View File

@ -651,8 +651,8 @@ int ff_frame_thread_init(AVCodecContext *avctx)
p->frame = av_frame_alloc();
if (!p->frame) {
err = AVERROR(ENOMEM);
av_freep(&copy);
err = AVERROR(ENOMEM);
goto error;
}