[FFmpeg-cvslog] Merge commit 'eeae858596a5ce5a84797283f590a16add5704f4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar  9 22:07:28 2014 +0100| [2f41b186963d6ad8c653133ad2ab7d36960cfcbc] | committer: Michael Niedermayer

Merge commit 'eeae858596a5ce5a84797283f590a16add5704f4'

* commit 'eeae858596a5ce5a84797283f590a16add5704f4':
  isom: Support Sony XAVC in mov

See: 5b9f39860d83380c4af3039710b4fcf3ea1f4c99
See: 6e65e3483706d969d176909fae9e216919f59277
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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