[Ffmpeg-devel] pip.c - PiP (Picture in Picture) v1.0 patch. Remakeof watermark.c

[Víctor Paesa]

Hi,
>> Hi,
>>
>>> P.S. 2 patches attached. The first is for Makefile, the other is pip.c
>>> itself
>>
>> I'm afraid that pip.patch is malformed (the space at the second
>> position is missing in many lines).
>>
>
> Forget my last sentence, the patch is malformed ...
> $ patch -p0 < ~/src/pip.patch
> patching file vhook/pip.c
> patch: **** malformed patch at line 1042:
>
> ... but changing the third line from ...
> @@ -0,0 +1,1040 @@
>
> ... to this other is enough.
> @@ -0,0 +1,1039 @@
>

It didn't compile:

gcc -I/home/Inma/src/ffmpeg_svn/ffmpeg -I/home/Inma/src/ffmpeg_svn/ffmpeg
-I/home/Inma/src/ffmpeg_svn/ffmpeg/libavutil
-I/home/Inma/src/ffmpeg_svn/ffmpeg/libavcodec
-I/home/Inma/src/ffmpeg_svn/ffmpeg/libavformat
-I/home/Inma/src/ffmpeg_svn/ffmpeg/libswscale -fPIC  -march=pentium4
-fomit-frame-pointer -pthread -g -Wdeclaration-after-statement -Wall
-Wno-switch -Wdisabled-optimization -Wpointer-arith -Wredundant-decls
-Winline -O3 -DHAVE_AV_CONFIG_H `freetype-config --cflags`   -c -o pip.o
pip.c
gcc: unrecognized option `-pthread'
pip.c:1: warning: -fPIC ignored for target (all code is position independent)
In file included from pip.c:139:

[snipped warnings on deprecations]

pip.c: In function `pip_get_frame':
pip.c:987: error: invalid operands to binary +
make[1]: *** [pip.o] Error 1
rm ppm.o null.o fish.o watermark.o

Could you please recheck the patch?
Regards,
V?ctor