diff options
| author | Michael Niedermayer <[email protected]> | 2014-04-13 04:00:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-04-13 04:02:09 +0200 |
| commit | d7644e0fdb5c6ba58091b62a27ba9eda4fd159f0 (patch) | |
| tree | 1bce125c970a611818911b5760403e6652b930e4 /libavresample/resample.c | |
| parent | a64d6d5152189fce84bded8c73af5b49d6657cce (diff) | |
| parent | e75ef2b7f48b96a9b6c8646058713899d5ea5731 (diff) | |
Merge commit 'e75ef2b7f48b96a9b6c8646058713899d5ea5731'
* commit 'e75ef2b7f48b96a9b6c8646058713899d5ea5731':
tiffdec: support predictor type 2 with RGB48 pixel format
Conflicts:
libavcodec/tiff.c
See: 72381b2b479d99962092ce458ac8e98f00528f86
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavresample/resample.c')
0 files changed, 0 insertions, 0 deletions