[FFmpeg-cvslog] Merge commit 'a01c02bcff755a7891f777706b27452203aac71e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec 19 22:24:37 2012 +0100| [465c7de7924db37f21bb47c667466aeddedde05d] | committer: Michael Niedermayer

Merge commit 'a01c02bcff755a7891f777706b27452203aac71e'

* commit 'a01c02bcff755a7891f777706b27452203aac71e':
  cmdutils: split parse_option().

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

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