Doom9's Forum - View Single Post

qyot27 · 7th August 2011, 05:02

r518 still crashes HCenc at 7%, no inkling of an error message during playback of the script with MPC when it passes the 7% mark.

As an aside, I normally do an svn merge in those times between the C-plugin's HEAD updates, but doing a plain merge currently fails due to the recent revisions concerning MSVC x64. Readout below:

Code:

svn merge http://ffmpegsource.googlecode.com/svn/trunk
--- Merging r506 into '.':
   C build-msvc/ffms2_include_dirs.props
   C build-msvc/ffmsindex.vcxproj.filters
   C build-msvc/ffms2.vcxproj
   C build-msvc/ffms2.sln
   C build-msvc/ffmsindex.vcxproj
   C build-msvc/ffms2.vcxproj.filters
D    build-msvc/ffms2_include_dirs.vsprops
   C build-msvc/ffms2.vcproj
   C build-msvc/ffmsindex.vcproj
svn: Attempt to add tree conflict that already exists at 'build-msvc/ffmsindex.vcxproj'
svn: Error reading spooled REPORT request response

I can work around that by specifying the revisions with -r, but if left alone it wants to merge from back at r506 instead of starting at the last C-plugin revision.

7th August 2011, 05:02	#1219 \| Link
qyot27 ...? Join Date: Nov 2005 Location: Florida Posts: 1,420	r518 still crashes HCenc at 7%, no inkling of an error message during playback of the script with MPC when it passes the 7% mark. As an aside, I normally do an svn merge in those times between the C-plugin's HEAD updates, but doing a plain merge currently fails due to the recent revisions concerning MSVC x64. Readout below: Code: svn merge http://ffmpegsource.googlecode.com/svn/trunk --- Merging r506 into '.': C build-msvc/ffms2_include_dirs.props C build-msvc/ffmsindex.vcxproj.filters C build-msvc/ffms2.vcxproj C build-msvc/ffms2.sln C build-msvc/ffmsindex.vcxproj C build-msvc/ffms2.vcxproj.filters D build-msvc/ffms2_include_dirs.vsprops C build-msvc/ffms2.vcproj C build-msvc/ffmsindex.vcproj svn: Attempt to add tree conflict that already exists at 'build-msvc/ffmsindex.vcxproj' svn: Error reading spooled REPORT request response I can work around that by specifying the revisions with -r, but if left alone it wants to merge from back at r506 instead of starting at the last C-plugin revision.