diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-04 01:43:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-04 02:00:07 +0100 |
| commit | 508229adb930c03ee0539faada5ff0b14fb570d6 (patch) | |
| tree | 82ea9560055edf741f8bf5f87395d33553a86619 /libavcodec/rv34dsp.h | |
| parent | 4a055f91bec2f746517ec7757e2b2a3bbdb90027 (diff) | |
| parent | e89aa4bf56e5b5c45f569eb12733519789e057da (diff) | |
| download | ffmpeg-508229adb930c03ee0539faada5ff0b14fb570d6.tar.gz | |
Merge commit 'e89aa4bf56e5b5c45f569eb12733519789e057da'
* commit 'e89aa4bf56e5b5c45f569eb12733519789e057da':
lzw: switch to bytestream2
Conflicts:
libavcodec/lzw.c
See: 44c4170c52c10e3da3a7ea8e3435ef37c4edc2cc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rv34dsp.h')
0 files changed, 0 insertions, 0 deletions