diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 05:09:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 05:11:48 +0200 |
| commit | 1fa7d0902c3eef6fc17f253b5e90c77167483458 (patch) | |
| tree | b35db5c5fed4e40dd2b0e4eaf25b5d693857d70d /libavcodec/allcodecs.c | |
| parent | 55b866f618582350bcc5489d4e96afd40c9c8c44 (diff) | |
| parent | 5b5338f6d1272526d2634501555cbaff4cdfb87b (diff) | |
| download | ffmpeg-1fa7d0902c3eef6fc17f253b5e90c77167483458.tar.gz | |
Merge commit '5b5338f6d1272526d2634501555cbaff4cdfb87b'
* commit '5b5338f6d1272526d2634501555cbaff4cdfb87b':
hqx: Implement slice-threaded decoding
Conflicts:
libavcodec/hqx.c
libavcodec/hqx.h
See: eff72a6c7375587a3280ddf59e6e26a4907823b7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/allcodecs.c')
0 files changed, 0 insertions, 0 deletions