[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  3 12:54:35 2013 +0200| [3da711119340a983c95015eeb4cffc55d6a9f361] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  movenc: Change the track struct name to match the typedef

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3da711119340a983c95015eeb4cffc55d6a9f361
---