blob: 1a9aeb5ea5728a3a4a7acc277859b5572685249d (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
diff -wru /home/fsousa/tmp/xvidcap-1.1.7/src/codecs.c xvidcap-1.1.7/src/codecs.c
--- src/codecs.c 2008-05-25 23:01:53.000000000 +0100
+++ src/codecs.c 2008-08-10 15:58:40.000000000 +0100
@@ -43,8 +43,8 @@
#include <locale.h>
#ifdef USE_FFMPEG
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/avformat.h>
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
#endif // USE_FFMPEG
#include "app_data.h"
diff -wru /home/fsousa/tmp/xvidcap-1.1.7/src/main.c xvidcap-1.1.7/src/main.c
--- src/main.c 2008-05-25 23:01:54.000000000 +0100
+++ src/main.c 2008-08-10 15:59:07.000000000 +0100
@@ -45,7 +45,7 @@
#include <locale.h>
#ifdef USE_FFMPEG
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
#endif // USE_FFMPEG
#include "control.h"
diff -wru /home/fsousa/tmp/xvidcap-1.1.7/src/xtoffmpeg.c xvidcap-1.1.7/src/xtoffmpeg.c
--- src/xtoffmpeg.c 2008-05-25 23:01:54.000000000 +0100
+++ src/xtoffmpeg.c 2008-08-10 16:01:08.000000000 +0100
@@ -56,13 +56,13 @@
#include "xvidcap-intl.h"
// ffmpeg stuff
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/avformat.h>
-#include <ffmpeg/avdevice.h>
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
+#include <libavdevice/avdevice.h>
//#include <ffmpeg/dsputil.h>
-#include <ffmpeg/swscale.h>
-#include <ffmpeg/rgb2rgb.h>
-#include <ffmpeg/fifo.h>
+#include <libswscale/swscale.h>
+//#include <libswscale/rgb2rgb.h>
+#include <libavutil/fifo.h>
#define swscale_isRGB(x) ((x)==PIX_FMT_BGR32 || (x)==PIX_FMT_RGB24 \
|| (x)==PIX_FMT_RGB565 || (x)==PIX_FMT_RGB555 \
|| (x)==PIX_FMT_RGB8 || (x)==PIX_FMT_RGB4 \
|
GitWeb
