[FFmpeg-cvslog] Merge commit 'e352520e3ed7f08f19e63cd60e95da6bb6f037c1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Feb  7 21:00:19 2015 +0100| [7474ea74952b4d1be3bcd07efca5bd6c44b36b7a] | committer: Michael Niedermayer

Merge commit 'e352520e3ed7f08f19e63cd60e95da6bb6f037c1'

* commit 'e352520e3ed7f08f19e63cd60e95da6bb6f037c1':
  oma: Report a timestamp

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

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