On Sun, Jun 23, 2013 at 08:50:16AM +0200, Luca Barbato wrote: > From: Michael Niedermayer <[email protected]> > > Signed-off-by: Michael Niedermayer <[email protected]> > > Conflicts: > > libavcodec/j2k.h > --- > libavcodec/jpeg2000.h | 1 - > 1 file changed, 1 deletion(-)
The log message leaves me wondering what this is all about. Please remove these conflict markers, that file does not even exist. Diego _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
