Forgotten in 0eb399ac3953da16f880a1e455bb009a45f76d49. While just at it, also use a forward declaration.
Unified · Split
| @@ -24,7 +24,6 @@ · 23 unmodified lines | |||
| 24 | 24 | ||
| 25 | #include "avcodec.h" | 25 | #include "avcodec.h" |
| 26 | #include "me_cmp.h" | 26 | #include "me_cmp.h" |
| 27 | #include "threadframe.h" | ||
| 28 | 27 | ||
| 29 | ///< current MB is the first after a resync marker | 28 | ///< current MB is the first after a resync marker |
| 30 | #define VP_START 1 | 29 | #define VP_START 1 |
| @@ -40,7 +39,7 @@ · 9 unmodified lines | |||
| 40 | 39 | ||
| 41 | typedef struct ERPicture { | 40 | typedef struct ERPicture { |
| 42 | AVFrame *f; | 41 | AVFrame *f; |
| 43 | ThreadFrame *tf; | 42 | const struct ThreadFrame *tf; |
| 44 | 43 | ||
| 45 | // it is the caller's responsibility to allocate these buffers | 44 | // it is the caller's responsibility to allocate these buffers |
| 46 | int16_t (*motion_val[2])[2]; | 45 | int16_t (*motion_val[2])[2]; |
| @@ -43,6 +43,7 @@ · 42 unmodified lines | |||
| 43 | #include "h264qpel.h" | 43 | #include "h264qpel.h" |
| 44 | #include "h274.h" | 44 | #include "h274.h" |
| 45 | #include "mpegutils.h" | 45 | #include "mpegutils.h" |
| 46 | #include "threadframe.h" | ||
| 46 | #include "videodsp.h" | 47 | #include "videodsp.h" |
| 47 | 48 | ||
| 48 | #define H264_MAX_PICTURE_COUNT 36 | 49 | #define H264_MAX_PICTURE_COUNT 36 |