Contents of /trunk/xine-lib/patches/xine-lib-1.1.1-newffmpeg.patch
Parent Directory | Revision Log
Revision 153 -
(show annotations)
(download)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 1237 byte(s)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 1237 byte(s)
-import
1 | Index: xine-lib-1.1.1/m4/ffmpeg.m4 |
2 | =================================================================== |
3 | --- xine-lib-1.1.1.orig/m4/ffmpeg.m4 |
4 | +++ xine-lib-1.1.1/m4/ffmpeg.m4 |
5 | @@ -65,10 +65,10 @@ if test x"$external_ffmpeg" != "xno"; th |
6 | dnl look for libpostproc inside libavcodec |
7 | AC_CHECK_LIB(avcodec, pp_get_context, |
8 | [external_ffmpeg_found=yes |
9 | - FFMPEG_LIBS="${FFMPEG_LIBS} -lavcodec" |
10 | + FFMPEG_LIBS="${FFMPEG_LIBS} -lavcodec -lm -lavutil" |
11 | break], |
12 | , |
13 | - [] |
14 | + [-lm -lavutil] |
15 | ) |
16 | |
17 | dnl look for shared libpostproc and avcodec |
18 | @@ -76,13 +76,14 @@ if test x"$external_ffmpeg" != "xno"; th |
19 | AC_CHECK_LIB(avcodec, register_avcodec, |
20 | [external_ffmpeg_found=yes |
21 | FFMPEG_POSTPROC_LIBS="${FFMPEG_LIBS} -lpostproc" |
22 | - FFMPEG_LIBS="${FFMPEG_LIBS} -lavcodec" |
23 | - break] |
24 | + FFMPEG_LIBS="${FFMPEG_LIBS} -lavcodec -lm -lavutil" |
25 | + break],, |
26 | + [-lm -lavutil] |
27 | ),, |
28 | [-lavcodec] |
29 | ) |
30 | done |
31 | - if test x$FFMPEG_POSTPROC_LIBS = "x"; then |
32 | + if test "x$FFMPEG_POSTPROC_LIBS" = "x"; then |
33 | FFMPEG_POSTPROC_LIBS="${FFMPEG_LIBS}" |
34 | fi |
35 |