[FFmpeg-cvslog] Merge commit 'f5245a9c6206878b892adf3ccbccc9311c202af5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug 27 12:52:34 2014 +0200| [2082c00ea2ed13a2a85d45a024bdc0beb3f18aff] | committer: Michael Niedermayer

Merge commit 'f5245a9c6206878b892adf3ccbccc9311c202af5'

* commit 'f5245a9c6206878b892adf3ccbccc9311c202af5':
  avconv: fix parsing the AVOptions for -target

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

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