diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-08 00:37:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-08 00:37:55 +0100 |
| commit | ec8a3e25d8cfed9f8f335b88d8162ae331b68df9 (patch) | |
| tree | c6cb7a859e3a20d47464faf86ac6d353a3e8c8ae /libavcodec/libopenjpegdec.c | |
| parent | 8e2bab5d4bddb4029503c0f90623854948ddb3c5 (diff) | |
| parent | c5cd2311518bdd6adff8d76a9aa69db00a5514ec (diff) | |
| download | ffmpeg-streaming-ec8a3e25d8cfed9f8f335b88d8162ae331b68df9.zip ffmpeg-streaming-ec8a3e25d8cfed9f8f335b88d8162ae331b68df9.tar.gz | |
Merge remote-tracking branch 'shariman/wmall'
* shariman/wmall:
Partially fix CDLMS prediction
Conflicts:
libavcodec/wmalosslessdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libopenjpegdec.c')
0 files changed, 0 insertions, 0 deletions
