diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 14:46:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 14:46:10 +0200 |
| commit | 9dfa5ea5dcc8171e4465fd90df56b5c199dbae49 (patch) | |
| tree | beb126aed78bdb30654f1bb58a672cc0c7ba95e9 /libavcodec/truemotion1.c | |
| parent | a4a16821d7326a6a62c6ac3d9fc8b3d8f111cefc (diff) | |
| parent | 86a2602e16171ddc10c3ec655c23b16ffa595059 (diff) | |
| download | ffmpeg-9dfa5ea5dcc8171e4465fd90df56b5c199dbae49.tar.gz | |
Merge commit '86a2602e16171ddc10c3ec655c23b16ffa595059'
* commit '86a2602e16171ddc10c3ec655c23b16ffa595059':
jpeg2000: Drop unused and writeonly fields
jpeg2000: Correctly calculate sgnd
Conflicts:
libavcodec/jpeg2000.h
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/truemotion1.c')
0 files changed, 0 insertions, 0 deletions