diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 03:42:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 03:42:16 +0100 |
| commit | 6fcdcc414b6541cb6548f462710d344fb844bafc (patch) | |
| tree | 4fdfb1bdbdd30c1c18403977cacd343ba0d807bb /tools | |
| parent | 3e889713ce45b938c91662339d3e9b1ff4d1be1a (diff) | |
| parent | 67fc8a15e4182ea111cfcd05897709f09d99a33a (diff) | |
| download | ffmpeg-6fcdcc414b6541cb6548f462710d344fb844bafc.tar.gz | |
Merge commit '67fc8a15e4182ea111cfcd05897709f09d99a33a'
* commit '67fc8a15e4182ea111cfcd05897709f09d99a33a':
theora: support different visible and coded frame size
Conflicts:
libavcodec/vp3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions