be0fd07457
Merge commit '219b39a71a5694b1c14a07b86477f665a5b6849b'
...
* commit '219b39a71a5694b1c14a07b86477f665a5b6849b':
parseutil: Use non ambiguous aliases for uhd
Conflicts:
doc/ffmpeg.texi
libavutil/parseutils.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc >
2015-07-21 16:55:39 +02:00
9ebe041e1c
Merge commit 'e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2'
...
* commit 'e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2':
parseutil: Add more resolution aliases
Conflicts:
doc/ffmpeg.texi
libavutil/parseutils.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc >
2015-07-20 04:32:28 +02:00
ecba41bfd3
doc: More semantic markup using @samp and @var where appropriate
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-03-23 17:08:08 +01:00
10fd7ff814
doc: avoid the incorrect phrase 'allow to'
...
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-03-08 21:59:28 +01:00
f3e886c7df
lavu/eval: add clip function
2014-07-17 11:29:01 +02:00
7bf5084e30
doc/utils: add missing @c man end title
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-07-15 15:03:59 +02:00
9898bd9a82
Fix spelling errors in texi files: accomodate -> accommodate allows to -> allows one to choosen -> chosen compability -> compatibility explictly -> explicitly overriden -> overridden specifed -> specified Trasmission -> Transmission
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-03-06 21:12:40 +01:00
64f73acd1d
cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices
...
Reviewed-by: Wei Gao <highgod0401@gmail.com >
Reviewed-by: Stefano Sabatini <stefasab@gmail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-12-09 21:21:36 +01:00
a3505136f9
doc/utils: document channel layout specification
2013-10-25 15:44:04 +02:00
9a63a45e48
doc/utils: fix docs build
...
Not sure this is the correct solution but that can be investigated too once
the docs build again
Tested-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-10-16 22:32:47 +02:00
155a5ff00d
doc/utils: reformat doc for color syntax and add list of supported colors
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com >
Signed-off-by: Stefano Sabatini <stefasab@gmail.com >
2013-10-16 18:32:15 +02:00
b4da1fa550
doc/utils: rewrite doc for time duration syntax
...
Extend description and clarify syntax.
Signed-off-by: Timothy Gu <timothygu99@gmail.com >
Signed-off-by: Stefano Sabatini <stefasab@gmail.com >
2013-10-16 18:32:15 +02:00
49ba6e56bd
lavu/parseutils: add more resolutions
...
See http://en.wikipedia.org/wiki/Graphics_display_resolution
Signed-off-by: Niv Sardi <xaiki@evilgiggle.com >
Signed-off-by: Stefano Sabatini <stefasab@gmail.com >
2013-10-07 11:45:03 +02:00
0bc34ef02e
doc/utils: use @code markup for opencl function names.
2013-04-12 23:10:59 +02:00
9ae9ae10f9
doc/utils: apply misc fixes to OpenCL docs
2013-04-12 18:21:57 +02:00
949c8627b6
doc: merge syntax.texi, eval.texi and opencl.texi into utils.texi
2013-04-12 18:21:57 +02:00
