diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-13 15:20:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-13 15:20:40 +0100 |
| commit | 7a79c055e378d1a079d439c3e99fa45289d4a68e (patch) | |
| tree | 4a0a1e4544ae2388902c363a74af398f7ea41a5e /libavcodec/sipr.c | |
| parent | 45660c7d1b76185de97160808d81885f9dd08e23 (diff) | |
| parent | a2448cfe167a4cd4eb631318550d4eef38fca24a (diff) | |
| download | ffmpeg-7a79c055e378d1a079d439c3e99fa45289d4a68e.tar.gz | |
Merge commit 'a2448cfe167a4cd4eb631318550d4eef38fca24a'
* commit 'a2448cfe167a4cd4eb631318550d4eef38fca24a':
jpeg2000: do not compute the same value twice
Conflicts:
libavcodec/jpeg2000.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sipr.c')
0 files changed, 0 insertions, 0 deletions