Merge commit 'e1f0c41e1aa37a9c166c43abf1b526c796ed7649' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Aug 2014 18:58:46 +0000 (20:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Aug 2014 18:58:53 +0000 (20:58 +0200)
commit946a106995bca70a360f5bd03fa503e8beb09cc5
tree542522d8a65a234312cf51d0143cb9cbe0661d9e
parentfed28fe054de573643ae3fee50ad7ae09d78e738
parente1f0c41e1aa37a9c166c43abf1b526c796ed7649
Merge commit 'e1f0c41e1aa37a9c166c43abf1b526c796ed7649' into release/1.1

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

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