aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Myznikov <andrey.myznikov@gmail.com>2014-03-05 18:21:07 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-03-23 21:01:50 +0100
commit4dc8b4d7d081648b0cdec7266acd364e38506c5b (patch)
treedb1c42409f43949347cba8552b299ba6e1ed1997
parent9ff0467566e971a61dbc2cc7920034a1412df8ee (diff)
downloadffmpeg-4dc8b4d7d081648b0cdec7266acd364e38506c5b.tar.gz
Fix pthread-related compile errors in iec61883.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 9deecdf85f0c1cebcc0a157114bf6dbc02a0a120) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavdevice/iec61883.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libavdevice/iec61883.c b/libavdevice/iec61883.c
index a63566e9d4..443ca3cd34 100644
--- a/libavdevice/iec61883.c
+++ b/libavdevice/iec61883.c
@@ -102,7 +102,7 @@ static int iec61883_callback(unsigned char *data, int length,
DVPacket *packet;
int ret;
-#ifdef THREADS
+#if THREADS
pthread_mutex_lock(&dv->mutex);
#endif
@@ -139,7 +139,7 @@ static int iec61883_callback(unsigned char *data, int length,
ret = 0;
exit:
-#ifdef THREADS
+#if THREADS
pthread_cond_broadcast(&dv->cond);
pthread_mutex_unlock(&dv->mutex);
#endif
@@ -151,7 +151,7 @@ static void *iec61883_receive_task(void *opaque)
struct iec61883_data *dv = (struct iec61883_data *)opaque;
int result;
-#ifdef THREADS
+#if THREADS
while (dv->thread_loop)
#endif
{
@@ -168,7 +168,7 @@ static void *iec61883_receive_task(void *opaque)
raw1394_loop_iterate(dv->raw1394);
} else if (dv->receiving) {
av_log(NULL, AV_LOG_ERROR, "No more input data available\n");
-#ifdef THREADS
+#if THREADS
pthread_mutex_lock(&dv->mutex);
dv->eof = 1;
pthread_cond_broadcast(&dv->cond);
@@ -413,7 +413,7 @@ static int iec61883_read_packet(AVFormatContext *context, AVPacket *pkt)
* Try to parse frames from queue
*/
-#ifdef THREADS
+#if THREADS
pthread_mutex_lock(&dv->mutex);
while ((size = dv->parse_queue(dv, pkt)) == -1)
if (!dv->eof)