diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 03:32:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 03:32:47 +0200 |
| commit | 77010a41fef047bff53536387db7fa043495bb6c (patch) | |
| tree | 9e9e10b92cb41eb5babd36c1b42250943686e66e /libavutil/lls.h | |
| parent | 7c24ca1bda2d4df1dc9b2b982941be532d60da21 (diff) | |
| parent | f5ba67ee1342b7741200ff637fc3ea3387b68a1b (diff) | |
| download | ffmpeg-77010a41fef047bff53536387db7fa043495bb6c.tar.gz | |
Merge commit 'f5ba67ee1342b7741200ff637fc3ea3387b68a1b'
* commit 'f5ba67ee1342b7741200ff637fc3ea3387b68a1b':
flacenc: Move a scratch buffer to struct used by the function
Conflicts:
libavcodec/flacenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/lls.h')
0 files changed, 0 insertions, 0 deletions