aboutsummaryrefslogtreecommitdiffstats
path: root/doc/ffmpeg.txt
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-16 03:40:13 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-16 03:40:51 +0200
commitf00bb086cb976a054a9c72df3a4fa7278a4f0dad (patch)
tree50922ab6b3f158856708f6ebcc15c04a9a28f8a1 /doc/ffmpeg.txt
parentfaafd1e4f1fcc2d618633eae4dc532050b2be988 (diff)
parent14b4e64eabc84c5a5e57c8ccc56bbeb95380823b (diff)
downloadffmpeg-f00bb086cb976a054a9c72df3a4fa7278a4f0dad.tar.gz
Merge commit '14b4e64eabc84c5a5e57c8ccc56bbeb95380823b'
* commit '14b4e64eabc84c5a5e57c8ccc56bbeb95380823b': g2meet: allow size changes within original sizes Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/ffmpeg.txt')
0 files changed, 0 insertions, 0 deletions