Merge commit 'b0bdc2a7123abd0287de435726ab68e9e475a8d8'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Apr 2014 22:46:28 +0000 (00:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Apr 2014 22:48:02 +0000 (00:48 +0200)
commitd3f3035f0857d04b1f7c5b1d44c7f3f0972638a0
tree81d48e3d4e780bf213c524caf6838c9f364dabd5
parentc2cd0945c9aea2ad3a9cd3fdf7e95020ab4d6536
parentb0bdc2a7123abd0287de435726ab68e9e475a8d8
Merge commit 'b0bdc2a7123abd0287de435726ab68e9e475a8d8'

* commit 'b0bdc2a7123abd0287de435726ab68e9e475a8d8':
  avutil: move av_get_time_base_q() after include rational.h

See: c7251fec39c5b54470bb295acfc81d89683843c7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/avutil.h