diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-14 01:24:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-14 01:24:26 +0100 |
| commit | 84873794ad922cbcbdb5f62deda6c1ed16668bcc (patch) | |
| tree | c761fa9760cf5e437266068fb38d7c788f56a786 /libavcodec/h264.c | |
| parent | 70acb151591214e2287a6d7a0e863395657ee533 (diff) | |
| parent | f795a8a8bf5e312dad2c2829c543b9d309376ca1 (diff) | |
| download | ffmpeg-84873794ad922cbcbdb5f62deda6c1ed16668bcc.tar.gz | |
Merge commit 'f795a8a8bf5e312dad2c2829c543b9d309376ca1'
* commit 'f795a8a8bf5e312dad2c2829c543b9d309376ca1':
h264: make context_count unsigned
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 574afcaa5e..fabb0463fe 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -4688,7 +4688,7 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg) * @param h h264 master context * @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; 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; H264Context *hx; ///< thread context int buf_index; - int context_count; + unsigned context_count; int next_avc; 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 |