highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'f795a8a8bf5e312dad2c2829c543b9d309376ca1'

Browse Source 
* commit 'f795a8a8bf5e312dad2c2829c543b9d309376ca1':
  h264: make context_count unsigned

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-02-14 01:24:20 +01:00
parent 70acb15159 f795a8a8bf
commit 84873794ad
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/h264.c
View File

@@ -4688,7 +4688,7 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg)
* @param h h264 master context * @param h h264 master context
* @param context_count number of contexts to execute * @param context_count number of contexts to execute
*/ */
static int execute_decode_slices(H264Context *h, int context_count) static int execute_decode_slices(H264Context *h, unsigned context_count)
{ {
AVCodecContext *const avctx = h->avctx; AVCodecContext *const avctx = h->avctx;
H264Context *hx; H264Context *hx;
@@ -4737,7 +4737,7 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size,
AVCodecContext *const avctx = h->avctx; AVCodecContext *const avctx = h->avctx;
H264Context *hx; ///< thread context H264Context *hx; ///< thread context
int buf_index; int buf_index;
int context_count; unsigned context_count;
int next_avc; int next_avc;
int pass = !(avctx->active_thread_type & FF_THREAD_FRAME); int pass = !(avctx->active_thread_type & FF_THREAD_FRAME);
int nals_needed = 0; ///< number of NALs that need decoding before the next frame thread starts int nals_needed = 0; ///< number of NALs that need decoding before the next frame thread starts