Merge commit 'f5245a9c6206878b892adf3ccbccc9311c202af5'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Aug 2014 10:52:34 +0000 (12:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Aug 2014 10:55:31 +0000 (12:55 +0200)
commit2082c00ea2ed13a2a85d45a024bdc0beb3f18aff
tree9aadc05e255f5c494eb486a93b2f535ea883d9cb
parentad207f1119d961bb83177765226ee8f3b80e369f
parentf5245a9c6206878b892adf3ccbccc9311c202af5
Merge commit 'f5245a9c6206878b892adf3ccbccc9311c202af5'

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

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