diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-23 12:35:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-23 12:35:10 +0200 |
| commit | b04b021005508e190ad02b66106c2c611b404a72 (patch) | |
| tree | a82dcb03f05755ff42f795f9def66587b24eed8c /libavcodec/hap.h | |
| parent | 157fa73992ab30b32160034e115aac21808084e2 (diff) | |
| parent | ae5a8dca675ee544178225256893e679b750cb63 (diff) | |
| download | ffmpeg-b04b021005508e190ad02b66106c2c611b404a72.tar.gz | |
Merge commit 'ae5a8dca675ee544178225256893e679b750cb63'
* commit 'ae5a8dca675ee544178225256893e679b750cb63':
hap: Fix slice size computation
Conflicts:
libavcodec/hapdec.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/hap.h')
| -rw-r--r-- | libavcodec/hap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/hap.h b/libavcodec/hap.h index 893b4c5f92..e334ba837e 100644 --- a/libavcodec/hap.h +++ b/libavcodec/hap.h @@ -77,7 +77,7 @@ typedef struct HapContext { size_t max_snappy; /* Maximum compressed size for snappy buffer */ - int slice_size; /* Optimal slice size */ + int slice_count; /* Number of slices for threaded operations */ /* Pointer to the selected compress or decompress function */ int (*tex_fun)(uint8_t *dst, ptrdiff_t stride, const uint8_t *block); |