diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-03 18:58:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-03 18:58:19 +0200 |
| commit | 2212bff9a2761c7786b27a9b8e3b42659d7e346e (patch) | |
| tree | 123561fb0cb5a0bef187aacb565a0c730d89a7f3 /libavcodec/mpc8data.h | |
| parent | 149c1a26c4c167a763461e191a248d704cb8538a (diff) | |
| parent | c697c590fbf296b1679b80c8f4071e4c8a6c884b (diff) | |
| download | ffmpeg-2212bff9a2761c7786b27a9b8e3b42659d7e346e.tar.gz | |
Merge commit 'c697c590fbf296b1679b80c8f4071e4c8a6c884b'
* commit 'c697c590fbf296b1679b80c8f4071e4c8a6c884b':
lcl: Disentangle pointers to input data and decompression buffer
Conflicts:
libavcodec/lcldec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpc8data.h')
0 files changed, 0 insertions, 0 deletions