On Tue, May 31, 2011 at 06:10:28PM +0100, Måns Rullgård wrote: > Diego Biurrun <[email protected]> writes: > > > > --- a/libavcodec/mpegaudio.h > > +++ b/libavcodec/mpegaudio.h > > @@ -58,14 +58,17 @@ > > > > #if CONFIG_FLOAT > > # define INTFLOAT float > > +# define FF_PRIx_or_e "e" > > typedef float MPA_INT; > > typedef float OUT_INT; > > #elif FRAC_BITS <= 15 > > # define INTFLOAT int > > +# define FF_PRIx_or_e "x" > > typedef int16_t MPA_INT; > > typedef int16_t OUT_INT; > > #else > > # define INTFLOAT int > > +# define FF_PRIx_or_e "x" > > typedef int32_t MPA_INT; > > typedef int16_t OUT_INT; > > #endif > > Did we not agree to leave the mpegaudio code alone until I'm done with it?
I thought you were referring to the shuffling I did to those typedefs, not the warning fix I implemented. Does this really conflict with your work? To be honest, I don't see why it should be such a big deal, I fix conflicts in my branches on a daily basis. If it is too much of a hassle for you, just publish your branch(es) somewhere and I will fix them up for you. Diego _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
