On Wed, Nov 09, 2016 at 11:19:10AM +0800, Chen Meng wrote: > Sorry for that, I've taken code back into up-date master branch again.--- > libavformat/mov.c | 34 ++++++++++++++++++++-------------- > 1 file changed, 20 insertions(+), 14 deletions(-)
the problem is not at the branch level, theres something wrong with the mail these dont apply either, and all the whitespaces in the mail look odd Patch is empty. Was it split wrong? When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB When the tyrant has disposed of foreign enemies by conquest or treaty, and there is nothing more to fear from them, then he is always stirring up some war or other, in order that the people may require a leader. -- Plato
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
