diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 03:13:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 03:19:23 +0100 |
| commit | 9aabe6678147d947ce7a32bf9bb1e087fac7fdde (patch) | |
| tree | 519b7d12aebdc9027f8ee4b412203abfdb97907e /ffmpeg_vda.c | |
| parent | c8e05c438f78ac5fee40f260a7f822f5a81b44e0 (diff) | |
| parent | 3a3790b8f8b56ee6abc93ccac280eb693675e294 (diff) | |
| download | ffmpeg-9aabe6678147d947ce7a32bf9bb1e087fac7fdde.tar.gz | |
Merge commit '3a3790b8f8b56ee6abc93ccac280eb693675e294'
* commit '3a3790b8f8b56ee6abc93ccac280eb693675e294':
tiff: support encoding and decoding 64bit images
Conflicts:
libavcodec/tiff.c
libavcodec/tiffenc.c
libavcodec/version.h
See: c714cd3bd4af70e0cba1db399ca420b1f51a773d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_vda.c')
0 files changed, 0 insertions, 0 deletions