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)
* commit 'cb7b1a2dfb547ab78342a7a9d5cd729d77d90421':
  electronicarts: set the framerate for TGQ/TQI

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

Simple merge