eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-06 22:25:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'ae5a8dca675ee544178225256893e679b750cb63'

Browse Source 
* commit 'ae5a8dca675ee544178225256893e679b750cb63':
  hap: Fix slice size computation

Conflicts:
	libavcodec/hapdec.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2015-07-23 12:35:10 +02:00
parent 157fa73992 ae5a8dca67
commit b04b021005
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/hap.h
View File

@@ -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);