[FFmpeg-cvslog] Fix pthread-related compile errors in iec61883.c
Andrey Myznikov
git at videolan.org
Wed Mar 5 22:48:57 CET 2014
ffmpeg | branch: master | Andrey Myznikov <andrey.myznikov at gmail.com> | Wed Mar 5 18:21:07 2014 +0200| [9deecdf85f0c1cebcc0a157114bf6dbc02a0a120] | committer: Michael Niedermayer
Fix pthread-related compile errors in iec61883.c
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9deecdf85f0c1cebcc0a157114bf6dbc02a0a120
---
libavdevice/iec61883.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/libavdevice/iec61883.c b/libavdevice/iec61883.c
index 92b9dc2..401c3dd 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)
More information about the ffmpeg-cvslog
mailing list