MediaCoder http://mediacoder.sourceforge.net/ is an open source windows program. It looks a bit daunting at first, but it has some great features, and has worked really well for me.
Go to the picture tab and change the frame rate to 30 frames/second before doing any conversions so that it matches the frame rate of the TX1 avi file (the program defaults to 25).
It remembers your settings - if you change something and cant remember how to get back, you can use "Revert all settings" from the file menu. However you would then need to reenter all settings you care about (e.g. output format, setting frame rate to 30!).