[FFmpeg-cvslog] Merge commit 'c09804684a47e6572ee82ded5d84c8b282815da6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar  9 22:06:08 2014 +0100| [8a5397d88b8cebd82962cca5ed8688f0ce056f18] | committer: Michael Niedermayer

Merge commit 'c09804684a47e6572ee82ded5d84c8b282815da6'

* commit 'c09804684a47e6572ee82ded5d84c8b282815da6':
  isom: add xd51 hdcam

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

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