Merge commit 'cb7b1a2dfb547ab78342a7a9d5cd729d77d90421'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Aug 2014 18:59:49 +0000 (20:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Aug 2014 19:00:06 +0000 (21:00 +0200)
commit3e07a056a8e67c8c8a1fdf4b1efd231aa9bcd0ad
tree45f19f2bb2c5f64016a3bda07e9ae07465ebeac1
parentce1059d5c9098d4c2f89288653198b2c03ea8f85
parentcb7b1a2dfb547ab78342a7a9d5cd729d77d90421
Merge commit 'cb7b1a2dfb547ab78342a7a9d5cd729d77d90421'

* commit 'cb7b1a2dfb547ab78342a7a9d5cd729d77d90421':
  electronicarts: set the framerate for TGQ/TQI

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/electronicarts.c