diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 16:42:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 16:42:33 +0200 |
| commit | 13f86baa1d98c89e6ac176f182e7a1ebc7c260b7 (patch) | |
| tree | b8b6f4cb78a37fb373c3fc5b2b402297298e9a3e /libavformat/jacosubenc.c | |
| parent | 5eb23e6b0ae28168cce9fadb103e3af97f9ee5ca (diff) | |
| parent | 95a57d26d8653d21f0dab1aff3558ee944853dbf (diff) | |
| download | ffmpeg-13f86baa1d98c89e6ac176f182e7a1ebc7c260b7.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
jpeg2000: Use the matching coding style struct for transform selection
jpeg2000: Merge rescaling with interleaving in 9/7 IDWT
No change, all commits & hunks where already in.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/jacosubenc.c')
0 files changed, 0 insertions, 0 deletions