[Ffmpeg-devel] [PATCH] fix usage of various bitstream readers

[Aurelien Jacobs]

On Mon, 28 Aug 2006 19:13:29 +0200
Aurelien Jacobs <aurel at gnuage.org> wrote:

> On Mon, 28 Aug 2006 17:57:54 +0200
> Michael Niedermayer <michaelni at gmx.at> wrote:
> 
> > Hi
> > 
> > On Mon, Aug 28, 2006 at 05:13:02PM +0200, Aurelien Jacobs wrote:
> > > Hi,
> > > 
> > > This set of patch allows to use the A32_BITSTREAM_READER without any
> > > regression (as well on x86 as on arm).
> > > The first one moves get_bits_long(), show_bits_long() and check_marker()
> > > to bitstream.h to avoid conflicts between different bitstream readers in
> > > different codecs.
> > > The second one forces the use of ALT_BITSTREAM_READER for the dv and flac
> > > codec. dv.c don't compile with any other bitstream reader, and flac.c
> > > crashes with other bitstream reader. It also forces the usage of
> > > ALT_BITSTREAM_READER for codecs who needs ALT_BITSTREAM_READER_LE.
> > > 
> > > Ok to apply ?
> > [...]
> > > Index: libavcodec/bitstream.h
> > > ===================================================================
> > > --- libavcodec/bitstream.h	(revision 6102)
> > > +++ libavcodec/bitstream.h	(working copy)
> > > @@ -6,6 +6,8 @@
> > >  #ifndef BITSTREAM_H
> > >  #define BITSTREAM_H
> > >  
> > > +#include "avcodec.h"
> > 
> > why?
> 
> Because a call to av_log (using AV_LOG_INFO) is added to this file.
> I've just found out that the same include was already present in this
> file (but only conditionnaly), so I removed the conditionnal one.
> Updated patch attached.

hum.... and here is the patch ;-)

Aurel
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: bitstream1.diff
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20060828/09c7c4c8/attachment.txt>