diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-06 20:23:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-06 20:23:54 +0200 |
| commit | d423fc12e6e11f5d7792f8fd916fb10133862360 (patch) | |
| tree | 0b7f5ffa952fd1cfd69ea058c1b7dc89d6b8826f /libavcodec/mlpdsp.h | |
| parent | 958ddef46c222b080988700c3526cb165d23ed62 (diff) | |
| parent | d00f1e0fc10bb945cdf140a6c320eb0c9cd25162 (diff) | |
| download | ffmpeg-d423fc12e6e11f5d7792f8fd916fb10133862360.tar.gz | |
Merge commit 'd00f1e0fc10bb945cdf140a6c320eb0c9cd25162'
* commit 'd00f1e0fc10bb945cdf140a6c320eb0c9cd25162':
quickdraw: Convert to bytestream2
Conflicts:
libavcodec/qdrw.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mlpdsp.h')
0 files changed, 0 insertions, 0 deletions