Merge remote-tracking branch 'qatar/master'
[ffmpeg.git] / libavformat / mkvtimestamp_v2.c
2011-11-13 Michael Niedermayermkvtimestamp v2 muxer: rename so as to avoid confusion...