Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

Fix pthread-related compile errors in iec61883.c

Browse source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Andrey Myznikov 2014-03-05 18:21:07 +02:00 • committed by Michael Niedermayer
parent 91550f46cd
commit 9deecdf85f
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libavdevice/iec61883.c
View file

@ -102,7 +102,7 @@ static int iec61883_callback(unsigned char *data, int length,
DVPacket *packet; DVPacket *packet;
int ret; int ret;
#ifdef THREADS #if THREADS
pthread_mutex_lock(&dv->mutex); pthread_mutex_lock(&dv->mutex);
#endif #endif
@ -139,7 +139,7 @@ static int iec61883_callback(unsigned char *data, int length,
ret = 0; ret = 0;
exit: exit:
#ifdef THREADS #if THREADS
pthread_cond_broadcast(&dv->cond); pthread_cond_broadcast(&dv->cond);
pthread_mutex_unlock(&dv->mutex); pthread_mutex_unlock(&dv->mutex);
#endif #endif
@ -151,7 +151,7 @@ static void *iec61883_receive_task(void *opaque)
struct iec61883_data *dv = (struct iec61883_data *)opaque; struct iec61883_data *dv = (struct iec61883_data *)opaque;
int result; int result;
#ifdef THREADS #if THREADS
while (dv->thread_loop) while (dv->thread_loop)
#endif #endif
{ {
@ -168,7 +168,7 @@ static void *iec61883_receive_task(void *opaque)
raw1394_loop_iterate(dv->raw1394); raw1394_loop_iterate(dv->raw1394);
} else if (dv->receiving) { } else if (dv->receiving) {
av_log(NULL, AV_LOG_ERROR, "No more input data available\n"); av_log(NULL, AV_LOG_ERROR, "No more input data available\n");
#ifdef THREADS #if THREADS
pthread_mutex_lock(&dv->mutex); pthread_mutex_lock(&dv->mutex);
dv->eof = 1; dv->eof = 1;
pthread_cond_broadcast(&dv->cond); pthread_cond_broadcast(&dv->cond);
@ -413,7 +413,7 @@ static int iec61883_read_packet(AVFormatContext *context, AVPacket *pkt)
* Try to parse frames from queue * Try to parse frames from queue
*/ */
#ifdef THREADS #if THREADS
pthread_mutex_lock(&dv->mutex); pthread_mutex_lock(&dv->mutex);
while ((size = dv->parse_queue(dv, pkt)) == -1) while ((size = dv->parse_queue(dv, pkt)) == -1)
if (!dv->eof) if (!dv->eof)