[Ffmpeg-devel] [PATCH] Fix --disable-opts compilation

[Michael Niedermayer]

Hi

On Wed, Mar 14, 2007 at 05:19:23PM +0100, Panagiotis Issaris wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Hi,
> 
> Panagiotis Issaris schreef:
> > The attached patch fixes the compilation of FFmpeg when configured using
> > --disable-opts. This patch depends on patches [1] en [2] posted earlier
> > today.
> > 
> >  cabac.h |    4 ++--
> >  h264.c  |    2 +-
> >  2 files changed, 3 insertions(+), 3 deletions(-)
> > 
> > Note: It is still needed to use the --disable-mmx flag to have ffmpeg
> > linked successfully.
> 
> 
> > With friendly regards,
> > Takis
> > 
> > [1][PATCH] Check whether EBX is available
> > http://article.gmane.org/gmane.comp.video.ffmpeg.devel/46434
> > [2] Re: [BUG] Compilation failure when using --disable-opts
> > http://article.gmane.org/gmane.comp.video.ffmpeg.devel/46433
> 
> Oops, forgot to attach it... Here it is.

and i forgot x86_64 ...

[...]
> diff --git a/libavcodec/cabac.h b/libavcodec/cabac.h
> index fc9fc6d..e8b1b88 100644
> --- a/libavcodec/cabac.h
> +++ b/libavcodec/cabac.h
> @@ -376,7 +376,7 @@ static int av_always_inline get_cabac_inline(CABACContext *c, uint8_t * const st
>  #define BYTE        "16"
>  #define BYTEEND     "20"
>  #endif
> -#if defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__))
> +#if defined(ARCH_X86) && defined(CONFIG_EBP) && defined(CONFIG_EBX)
>      int bit;

this is wrong it explicitly refers to EBX but not top EBP it just uses 7
registers which with x86-32 means ebp must be used
correct would be

#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX)

and in a central header
#if defined(ARCH_X86_64) || (defined(ARCH_X86_32) && defined(CONFIG_EBX) && defined(CONFIG_EBP))
#define CONFIG_7REGS 1
#endif


[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Let us carefully observe those good qualities wherein our enemies excel us
and endeavor to excel them, by avoiding what is faulty, and imitating what
is excellent in them. -- Plutarch
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20070315/bbf20087/attachment.pgp>