diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 18:40:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 18:40:46 +0200 |
| commit | 61b9ce00a30c8bb261678d9c210a06b5eefaed7a (patch) | |
| tree | 27140aa41bced772346eb6eaa2da55049b1eac17 /libavformat/hlsproto.c | |
| parent | 78eaaa857e95fa5542dc008c8ad3664e6ab6801a (diff) | |
| parent | 2597a842a0a2c7e8aa76f32733d27bf64817ae86 (diff) | |
| download | ffmpeg-61b9ce00a30c8bb261678d9c210a06b5eefaed7a.tar.gz | |
Merge commit '2597a842a0a2c7e8aa76f32733d27bf64817ae86'
* commit '2597a842a0a2c7e8aa76f32733d27bf64817ae86':
tiff: Improve grayscale support
Conflicts:
libavcodec/tiff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/hlsproto.c')
0 files changed, 0 insertions, 0 deletions