diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-23 10:46:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-23 10:46:05 +0200 |
| commit | 402bec52d4d3dd7575fa502f59de30a88983d1c6 (patch) | |
| tree | 76a5fda2434788ea2ecaf77d1ca55c9820bfb565 /libavcodec/aandcttab.h | |
| parent | 1fded9b69cc7af81fbc9ebd957a35e5d544eafb4 (diff) | |
| parent | 3f0b6d7a6248a33df37b98cfcb37a1acce263f62 (diff) | |
| download | ffmpeg-402bec52d4d3dd7575fa502f59de30a88983d1c6.tar.gz | |
Merge commit '3f0b6d7a6248a33df37b98cfcb37a1acce263f62'
* commit '3f0b6d7a6248a33df37b98cfcb37a1acce263f62':
wavpack: use bytestream2 in wavpack_decode_block
Conflicts:
libavcodec/wavpack.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aandcttab.h')
0 files changed, 0 insertions, 0 deletions