aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/h264.c
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2014-02-28 13:21:59 +0100
committerVittorio Giovara <vittorio.giovara@gmail.com>2014-03-16 23:01:01 +0100
commite3c2d0f3d41f79f7be7ba944aaca2e287c7d5c7c (patch)
treea7def89eae3816493ac1bb5fa31233738a55fe7d /libavcodec/h264.c
parent5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27 (diff)
downloadffmpeg-e3c2d0f3d41f79f7be7ba944aaca2e287c7d5c7c.tar.gz
h264: Replace mpegvideo-specific MAX_THREADS by private define
Diffstat (limited to 'libavcodec/h264.c')
-rw-r--r--libavcodec/h264.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index d78cdb84f4..99f8f142e4 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1195,7 +1195,7 @@ static void free_tables(H264Context *h, int free_rbsp)
h->cur_pic_ptr = NULL;
- for (i = 0; i < MAX_THREADS; i++) {
+ for (i = 0; i < H264_MAX_THREADS; i++) {
hx = h->thread_context[i];
if (!hx)
continue;
@@ -3224,12 +3224,12 @@ static int h264_slice_header_init(H264Context *h, int reinit)
return ret;
}
- if (nb_slices > MAX_THREADS || (nb_slices > h->mb_height && h->mb_height)) {
+ if (nb_slices > H264_MAX_THREADS || (nb_slices > h->mb_height && h->mb_height)) {
int max_slices;
if (h->mb_height)
- max_slices = FFMIN(MAX_THREADS, h->mb_height);
+ max_slices = FFMIN(H264_MAX_THREADS, h->mb_height);
else
- max_slices = MAX_THREADS;
+ max_slices = H264_MAX_THREADS;
av_log(h->avctx, AV_LOG_WARNING, "too many threads/slices %d,"
" reducing to %d\n", nb_slices, max_slices);
nb_slices = max_slices;