]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit 'c09804684a47e6572ee82ded5d84c8b282815da6'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 21:06:08 +0000 (22:06 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 21:06:35 +0000 (22:06 +0100)
* commit 'c09804684a47e6572ee82ded5d84c8b282815da6':
  isom: add xd51 hdcam

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

Trivial merge