diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-23 20:48:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-23 20:48:05 +0200 |
| commit | 088875b6b8553cfa591a5edafd3652e4bb80c695 (patch) | |
| tree | fe304c55ee66929ff8609e00f998f3f4953563cd /libavutil/adler32.c | |
| parent | 09f5b3750f2d8164497ff4bdca74d01c9b25a361 (diff) | |
| parent | 7288b345850792430302a8f85a4b29140b770497 (diff) | |
| download | ffmpeg-088875b6b8553cfa591a5edafd3652e4bb80c695.tar.gz | |
Merge commit '7288b345850792430302a8f85a4b29140b770497'
* commit '7288b345850792430302a8f85a4b29140b770497':
fft-test: Drop unnecessary pointer indirection for context structs
Conflicts:
libavcodec/fft-test.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/adler32.c')
0 files changed, 0 insertions, 0 deletions