ffmpeg | branch: release/0.10 | Luca Barbato <lu_z...@gentoo.org> | Sat Aug 9 14:14:34 2014 +0200| [e24d1cbc4e134e0b4448b3bc3a80f3197271b347] | committer: Luca Barbato
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. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e24d1cbc4e134e0b4448b3bc3a80f3197271b347 --- libavcodec/mxpegdec.c | 1 + libavcodec/pthread.c | 2 +- libavcodec/roqvideoenc.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/mxpegdec.c b/libavcodec/mxpegdec.c index fff5c7e..dda4b32 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 345456c..7a89cc4 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 58dd255..2683a4a 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 _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
