diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 16:22:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 16:26:01 +0200 |
| commit | 19ff6f55e800d848920af4a10e9516e51bfdcb0f (patch) | |
| tree | b590f0bdfe74babb79986cdccef522c03833d446 /presets/libx264-ipod320.ffpreset | |
| parent | 1abb875c980ab9ab12bc6fe0e0762f489d887968 (diff) | |
| parent | d57c737ac30cf079a342fa649fd4888c2d059dd9 (diff) | |
| download | ffmpeg-19ff6f55e800d848920af4a10e9516e51bfdcb0f.tar.gz | |
Merge commit 'd57c737ac30cf079a342fa649fd4888c2d059dd9'
* commit 'd57c737ac30cf079a342fa649fd4888c2d059dd9':
jpeg2000: Simplify jpeg2000_decode_packets()
jpeg2000: Do not crash on NULL node in tag_tree_decode
jpeg2000: Refactor SOT marker parsing
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'presets/libx264-ipod320.ffpreset')
0 files changed, 0 insertions, 0 deletions