Sync the test files with r3100.  Changes to the video test files on head of trunk are to support Mahesh's code for 0.25.  Mahesh's code has not yet been submitted to trunk.

git-svn-id: svn://dev.exiv2.org/svn@3257 b7c8b350-86e7-0310-a4b4-de8f6a8f16a3