aboutsummaryrefslogtreecommitdiffstats
path: root/doc/ffmpeg.txt
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-30 20:58:46 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-30 20:58:53 +0200
commit946a106995bca70a360f5bd03fa503e8beb09cc5 (patch)
tree542522d8a65a234312cf51d0143cb9cbe0661d9e /doc/ffmpeg.txt
parentfed28fe054de573643ae3fee50ad7ae09d78e738 (diff)
parente1f0c41e1aa37a9c166c43abf1b526c796ed7649 (diff)
downloadffmpeg-946a106995bca70a360f5bd03fa503e8beb09cc5.tar.gz
Merge commit 'e1f0c41e1aa37a9c166c43abf1b526c796ed7649' into release/1.1
* commit 'e1f0c41e1aa37a9c166c43abf1b526c796ed7649': avconv: fix parsing the AVOptions for -target Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/ffmpeg.txt')
0 files changed, 0 insertions, 0 deletions