1 --- source/blender/blenkernel/intern/writeffmpeg.c~ 2008-10-14 19:44:53.000000000 +0200
2 +++ source/blender/blenkernel/intern/writeffmpeg.c 2008-10-18 22:08:01.532780779 +0200
7 -#include <ffmpeg/avformat.h>
8 -#include <ffmpeg/avcodec.h>
9 -#include <ffmpeg/rational.h>
10 -#include <ffmpeg/swscale.h>
11 -#include <ffmpeg/opt.h>
12 +#include <libavformat/avformat.h>
13 +#include <libavcodec/avcodec.h>
14 +#include <libavutil/rational.h>
15 +#include <libswscale/swscale.h>
16 +#include <libavcodec/opt.h>
18 #if LIBAVFORMAT_VERSION_INT < (49 << 16)
19 #define FFMPEG_OLD_FRAME_RATE 1
20 --- source/blender/imbuf/intern/IMB_anim.h.org 2008-10-18 22:19:31.826461817 +0200
21 +++ source/blender/imbuf/intern/IMB_anim.h 2008-10-18 22:20:00.836042614 +0200
23 #endif /* WITH_QUICKTIME */
26 -#include <ffmpeg/avformat.h>
27 -#include <ffmpeg/avcodec.h>
28 -#include <ffmpeg/swscale.h>
29 +#include <libavformat/avformat.h>
30 +#include <libavcodec/avcodec.h>
31 +#include <libswscale/swscale.h>
35 --- source/blender/imbuf/intern/util.c.org 2008-10-18 22:35:38.951948174 +0200
36 +++ source/blender/imbuf/intern/util.c 2008-10-18 22:35:56.658612921 +0200
41 -#include <ffmpeg/avcodec.h>
42 -#include <ffmpeg/avformat.h>
43 +#include <libavcodec/avcodec.h>
44 +#include <libavformat/avformat.h>
46 #if LIBAVFORMAT_VERSION_INT < (49 << 16)
47 #define FFMPEG_OLD_FRAME_RATE 1
48 --- source/blender/imbuf/intern/anim.c.org 2008-10-18 22:43:53.181485966 +0200
49 +++ source/blender/imbuf/intern/anim.c 2008-10-18 22:44:25.228770272 +0200
51 #include "IMB_anim5.h"
54 -#include <ffmpeg/avformat.h>
55 -#include <ffmpeg/avcodec.h>
56 -#include <ffmpeg/rational.h>
57 -#include <ffmpeg/swscale.h>
58 +#include <libavformat/avformat.h>
59 +#include <libavcodec/avcodec.h>
60 +#include <libavutil/rational.h>
61 +#include <libswscale/swscale.h>
63 #if LIBAVFORMAT_VERSION_INT < (49 << 16)
64 #define FFMPEG_OLD_FRAME_RATE 1
65 --- source/blender/src/hddaudio.c.org 2008-10-18 22:50:45.531440517 +0200
66 +++ source/blender/src/hddaudio.c 2008-10-18 22:51:09.511439978 +0200
71 -#include <ffmpeg/avformat.h>
72 -#include <ffmpeg/avcodec.h>
73 -#include <ffmpeg/rational.h>
74 +#include <libavformat/avformat.h>
75 +#include <libavcodec/avcodec.h>
76 +#include <libavutil/rational.h>
77 #if LIBAVFORMAT_VERSION_INT < (49 << 16)
78 #define FFMPEG_OLD_FRAME_RATE 1
81 audio_pkt_size = packet.size;
83 while (audio_pkt_size > 0) {
84 - len = avcodec_decode_audio(
85 + len = avcodec_decode_audio2(
92 while (audio_pkt_size > 0) {
93 - len = avcodec_decode_audio(
94 + len = avcodec_decode_audio2(
98 --- source/blender/src/buttons_scene.c.org 2008-10-18 22:59:08.335140431 +0200
99 +++ source/blender/src/buttons_scene.c 2008-10-18 22:59:45.185099794 +0200
104 -#include <ffmpeg/avcodec.h> /* for PIX_FMT_* and CODEC_ID_* */
105 -#include <ffmpeg/avformat.h>
106 -#include <ffmpeg/opt.h>
107 +#include <libavcodec/avcodec.h> /* for PIX_FMT_* and CODEC_ID_* */
108 +#include <libavformat/avformat.h>
109 +#include <libavcodec/opt.h>
111 static int ffmpeg_preset_sel = 0;