Merge commit 'f7395926f204051af9ad459a6d876b96ee6179ee' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Sep 2014 12:29:23 +0000 (14:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Sep 2014 12:29:23 +0000 (14:29 +0200)
* commit 'f7395926f204051af9ad459a6d876b96ee6179ee':
  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