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)
* commit 'f5245a9c6206878b892adf3ccbccc9311c202af5':
  avconv: fix parsing the AVOptions for -target

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

diff --cc ffmpeg_opt.c
Simple merge