aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2014-08-09 14:14:34 +0200
committerLuca Barbato <lu_zero@gentoo.org>2014-08-09 14:14:34 +0200
commite24d1cbc4e134e0b4448b3bc3a80f3197271b347 (patch)
tree706924a5f93c5e68f95946e358dab333039f4065
parentc98d164a6a2c3d93bfb10d44c946bc3ed56f14e7 (diff)
downloadffmpeg-e24d1cbc4e134e0b4448b3bc3a80f3197271b347.tar.gz
lavf: Fix leftovers from the ff_get_buffer patch
The automated script did not perfectly replace all the instances nor added internal.h in all the files requiring it.
-rw-r--r--libavcodec/mxpegdec.c1
-rw-r--r--libavcodec/pthread.c2
-rw-r--r--libavcodec/roqvideoenc.c1
3 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/mxpegdec.c b/libavcodec/mxpegdec.c
index fff5c7eef9..dda4b32073 100644
--- a/libavcodec/mxpegdec.c
+++ b/libavcodec/mxpegdec.c
@@ -27,6 +27,7 @@
#include "mjpeg.h"
#include "mjpegdec.h"
+#include "internal.h"
typedef struct MXpegDecodeContext {
MJpegDecodeContext jpg;
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index 345456ce6e..7a89cc4e82 100644
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -573,7 +573,7 @@ static int submit_packet(PerThreadContext *p, AVPacket *avpkt)
pthread_cond_wait(&p->progress_cond, &p->progress_mutex);
if (p->state == STATE_GET_BUFFER) {
- p->result = p-ff_get_buffer(p->avctx, p->requested_frame);
+ p->result = ff_get_buffer(p->avctx, p->requested_frame);
p->state = STATE_SETTING_UP;
pthread_cond_signal(&p->progress_cond);
}
diff --git a/libavcodec/roqvideoenc.c b/libavcodec/roqvideoenc.c
index 58dd255a55..2683a4ad0e 100644
--- a/libavcodec/roqvideoenc.c
+++ b/libavcodec/roqvideoenc.c
@@ -60,6 +60,7 @@
#include "bytestream.h"
#include "elbg.h"
#include "mathops.h"
+#include "internal.h"
#define CHROMA_BIAS 1