diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-06 11:38:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-06 11:44:05 +0200 |
| commit | 5710f55e490d0c3cf7348b3ca91c8c0fe4274be2 (patch) | |
| tree | 033991c8946d5c7cf0acec24991633a6836253f6 /ffprobe.c | |
| parent | 7fb123429e6c153e9ea1e1af6e0165c3583894d0 (diff) | |
| parent | 6b3ff6f91a535d6383f41ca7bdf760165dcb6015 (diff) | |
| download | ffmpeg-5710f55e490d0c3cf7348b3ca91c8c0fe4274be2.tar.gz | |
Merge commit '6b3ff6f91a535d6383f41ca7bdf760165dcb6015'
* commit '6b3ff6f91a535d6383f41ca7bdf760165dcb6015':
swscale: provide a default scaler if none is set
Conflicts:
libswscale/utils.c
The default is left at bicubic until someone has compared the scalers
properly speed and quality wise.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffprobe.c')
0 files changed, 0 insertions, 0 deletions