diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-06 03:51:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-10 04:53:00 +0200 |
| commit | 36cab9c408bd6c1af8321c29f74fce8e0d110fd2 (patch) | |
| tree | e2df93bb9ddd9d7b8d9d711f790f8978a491c292 | |
| parent | 34592d04fbeaf3dc993650f1fcf54ed76af9b26b (diff) | |
| download | ffmpeg-36cab9c408bd6c1af8321c29f74fce8e0d110fd2.tar.gz | |
avcodec/pthread_frame: fix missing unlock on error
Fixes CID1197057
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f87b3d552394cd03c1e9f180553d41600c575c69)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/pthread_frame.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index 4e385e7136..addcecc70f 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -356,8 +356,10 @@ static int submit_packet(PerThreadContext *p, AVPacket *avpkt) memcpy(p->buf, avpkt->data, avpkt->size); memset(p->buf + avpkt->size, 0, FF_INPUT_BUFFER_PADDING_SIZE); } - if ((ret = av_copy_packet_side_data(&p->avpkt, avpkt)) < 0) + if ((ret = av_copy_packet_side_data(&p->avpkt, avpkt)) < 0) { + pthread_mutex_unlock(&p->mutex); return ret; + } p->state = STATE_SETTING_UP; pthread_cond_signal(&p->input_cond); |