aboutsummaryrefslogtreecommitdiffstats
path: root/libswscale
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-09 04:40:39 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-04-09 04:49:15 +0200
commit43935842bd1307b084a32ea40d2ed6c8733e034a (patch)
tree03ca6b5f4800362f9cb2a8f49f28b1ab8e8054dd /libswscale
parent8f23045b169e439e9d1f587ecfda2ad1c345d6f5 (diff)
parent0d671ade99059fd47b155df85c10c35eb6d54878 (diff)
downloadffmpeg-43935842bd1307b084a32ea40d2ed6c8733e034a.tar.gz
Merge commit '0d671ade99059fd47b155df85c10c35eb6d54878'
* commit '0d671ade99059fd47b155df85c10c35eb6d54878': doc: Use a 3 columns multitable Conflicts: doc/encoders.texi No change as we dont use a multitable for this list we could of course switch to one though if it looks better comments welcome Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
0 files changed, 0 insertions, 0 deletions