diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-08 11:31:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-08 11:32:34 +0200 |
| commit | 1fec361f353cf140a67b28c2d73c3822a89a76d6 (patch) | |
| tree | 973bccb6cd7feab4fe92d22856fbdb522e214e8e /libavcodec/a64colors.h | |
| parent | a804632b155d7e4841ee568cadb05d4f7e5d4af9 (diff) | |
| parent | 016c5b066de08a93a5f6b5beb0ef377356b35cde (diff) | |
| download | ffmpeg-1fec361f353cf140a67b28c2d73c3822a89a76d6.tar.gz | |
Merge commit '016c5b066de08a93a5f6b5beb0ef377356b35cde'
* commit '016c5b066de08a93a5f6b5beb0ef377356b35cde':
tiff: refactor fax support in a separate function
Conflicts:
libavcodec/tiff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/a64colors.h')
0 files changed, 0 insertions, 0 deletions