On Thu, Mar 20, 2014 at 09:05:36AM +0100, wm4 wrote: > From: Michael Niedermayer <michae...@gmx.at> > > Sample: NeroRecodeSample.mp4 > Signed-off-by: Michael Niedermayer <michae...@gmx.at> > > Conflicts: > libavformat/mov.c
Please drop such conflict markers in the future. For now, it can be removed on push. Diego _______________________________________________ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel
