move sample size adjusting code after audio stsd v2 parsing to let v2 set correct channel number, fix Sony-hdv2.mov

Originally committed as revision 6373 to svn://svn.ffmpeg.org/ffmpeg/trunk