summaryrefslogtreecommitdiff
path: root/ffmpeg.h
diff options
context:
space:
mode:
authorNicolas George <george@nsup.org>2014-02-20 14:14:53 +0100
committerNicolas George <george@nsup.org>2014-05-26 11:40:21 +0200
commitfc9c857c2d1b61dbbd104750ca1533c4a4658655 (patch)
tree643b1d75a132d076f11321a26d93d5c6b30be288 /ffmpeg.h
parent55cc60cd6d9429270f5b3479c45a1abada72c05f (diff)
downloadffmpeg-fc9c857c2d1b61dbbd104750ca1533c4a4658655.tar.gz
ffmpeg: use thread message API.
Diffstat (limited to 'ffmpeg.h')
-rw-r--r--ffmpeg.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/ffmpeg.h b/ffmpeg.h
index 41d666340d..3783e2cc50 100644
--- a/ffmpeg.h
+++ b/ffmpeg.h
@@ -44,6 +44,7 @@
#include "libavutil/fifo.h"
#include "libavutil/pixfmt.h"
#include "libavutil/rational.h"
+#include "libavutil/threadmessage.h"
#include "libswresample/swresample.h"
@@ -336,13 +337,10 @@ typedef struct InputFile {
int accurate_seek;
#if HAVE_PTHREADS
+ AVThreadMessageQueue *in_thread_queue;
pthread_t thread; /* thread reading from this file */
int non_blocking; /* reading packets from the thread should not block */
- int finished; /* the thread has exited */
int joined; /* the thread has been joined */
- pthread_mutex_t fifo_lock; /* lock for access to fifo */
- pthread_cond_t fifo_cond; /* the main thread will signal on this cond after reading from fifo */
- AVFifoBuffer *fifo; /* demuxed packets are stored here; freed by the main thread */
#endif
} InputFile;