Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Jun 2013 10:54:35 +0000 (12:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Jun 2013 10:54:43 +0000 (12:54 +0200)
commit3da711119340a983c95015eeb4cffc55d6a9f361
tree4dd7a9578c11fa9fa165674d17dc53651d40cd17
parente5cdf9c03b1ef0913dad117b0e5d343a525f6d10
parent9683e37cd5c556c9974e78fba344ede4f33afd18
Merge remote-tracking branch 'qatar/master'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/movenc.h