diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-03 18:35:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-03 18:38:17 +0200 |
| commit | 149c1a26c4c167a763461e191a248d704cb8538a (patch) | |
| tree | 5762cb5d8734de9ea18eb590a07704bc76f9b0bd /libavcodec/lcldec.c | |
| parent | b7f8d3de2c41de98185c304b4e5b35018a96e451 (diff) | |
| parent | df507d5aa063c2ce31fac9f76c6f3bbe9a20c445 (diff) | |
Merge commit 'df507d5aa063c2ce31fac9f76c6f3bbe9a20c445'
* commit 'df507d5aa063c2ce31fac9f76c6f3bbe9a20c445':
tiff: Replace deprecated PIX_FMT names by modern ones
Conflicts:
libavcodec/tiff.c
See: ac627b3d38d370027406c93c2dcaac0b1712a7d4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/lcldec.c')
0 files changed, 0 insertions, 0 deletions