diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 06:16:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 06:17:29 +0100 |
| commit | bb3c0571d31a2aef2556050127b7b5f99298b237 (patch) | |
| tree | f38e6e368e4518699243ef9ec3a038fe5d248868 /libavcodec/h264.h | |
| parent | a81a2b514eec4614fca277c0cbd8f5a1dbe2946e (diff) | |
| parent | e3c2d0f3d41f79f7be7ba944aaca2e287c7d5c7c (diff) | |
| download | ffmpeg-bb3c0571d31a2aef2556050127b7b5f99298b237.tar.gz | |
Merge commit 'e3c2d0f3d41f79f7be7ba944aaca2e287c7d5c7c'
* commit 'e3c2d0f3d41f79f7be7ba944aaca2e287c7d5c7c':
h264: Replace mpegvideo-specific MAX_THREADS by private define
Conflicts:
libavcodec/h264.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 7b2cf5ff93..a18c96ded0 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -40,6 +40,7 @@ #include "rectangle.h" #define H264_MAX_PICTURE_COUNT 36 +#define H264_MAX_THREADS 32 #define MAX_SPS_COUNT 32 #define MAX_PPS_COUNT 256 @@ -617,7 +618,7 @@ typedef struct H264Context { * @name Members for slice based multithreading * @{ */ - struct H264Context *thread_context[MAX_THREADS]; + struct H264Context *thread_context[H264_MAX_THREADS]; /** * current slice number, used to initialize slice_num of each thread/context |