ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue Jun 30 21:36:16 2015 +0200| [cfcb9f5e3628fc8e768836cd4b9b377c24221cf9] | committer: Michael Niedermayer
Merge commit 'e95c7a61852cc5b9ce5445ff034b87553e61958a' * commit 'e95c7a61852cc5b9ce5445ff034b87553e61958a': mov: Preserve the metadata even when bit-exactness is requested Conflicts: libavformat/movenc.c tests/ref/vsynth/vsynth1-mpeg4 tests/ref/vsynth/vsynth2-mpeg4 See: a17ee4117dcb2922f57da33b8401d11b06e81cba Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cfcb9f5e3628fc8e768836cd4b9b377c24221cf9 --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog