On Fri, Dec 08, 2017 at 07:42:50PM +0100, Michael Niedermayer wrote: > On Fri, Dec 08, 2017 at 08:46:52AM +0100, Mateusz wrote: > > After commit 3701d49 'error_resilience: remove avpriv_atomic usage' > > we have included windows.h in much more files and we should > > avoid conflicts with defines/function declarations. > > > > Signed-off-by: Mateusz Brzostek <mateu...@poczta.onet.pl> > > --- > > libavcodec/jpegls.h | 2 ++ > > libavcodec/mjpegdec.h | 2 ++ > > libavcodec/mss2.c | 6 +++--- > > libavformat/mxfenc.c | 2 +- > > 4 files changed, 8 insertions(+), 4 deletions(-) > > tested on x86-32/64/arm/mips linux & x86-32/64 mingw
applied with the no longer needed hunk from mxfenc thx [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Many that live deserve death. And some that die deserve life. Can you give it to them? Then do not be too eager to deal out death in judgement. For even the very wise cannot see all ends. -- Gandalf
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
