| Message ID | GV1P250MB07376459B76FC089B42BD91E8FF7A@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM |
|---|---|
| State | Accepted |
| Commit | 1982113467661947bafce48558df752de4a4faba |
| Headers | show |
| Series | [FFmpeg-devel,1/5] avcodec/thread: Remove outdated documentation | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
diff --git a/libavcodec/mpegvideo_dec.c b/libavcodec/mpegvideo_dec.c index 6aa979433c..7aa46a4e25 100644 --- a/libavcodec/mpegvideo_dec.c +++ b/libavcodec/mpegvideo_dec.c @@ -37,6 +37,7 @@ #include "mpegvideo.h" #include "mpegvideodec.h" #include "mpeg4videodec.h" +#include "thread.h" #include "threadframe.h" #include "wmv2dec.h" diff --git a/libavcodec/thread.h b/libavcodec/thread.h index 180e1137ae..4edcfc3172 100644 --- a/libavcodec/thread.h +++ b/libavcodec/thread.h @@ -52,6 +52,8 @@ void ff_thread_flush(AVCodecContext *avctx); int ff_thread_decode_frame(AVCodecContext *avctx, AVFrame *picture, int *got_picture_ptr, AVPacket *avpkt); +int ff_thread_can_start_frame(AVCodecContext *avctx); + /** * If the codec defines update_thread_context(), call this * when they are ready for the next thread to start decoding diff --git a/libavcodec/threadframe.h b/libavcodec/threadframe.h index d581c408a5..a8403c8976 100644 --- a/libavcodec/threadframe.h +++ b/libavcodec/threadframe.h @@ -87,6 +87,4 @@ int ff_thread_ref_frame(ThreadFrame *dst, const ThreadFrame *src); int ff_thread_replace_frame(AVCodecContext *avctx, ThreadFrame *dst, const ThreadFrame *src); -int ff_thread_can_start_frame(AVCodecContext *avctx); - #endif
It does not use ThreadFrames at all, so thread.h is the correct place. bcb0faeaba60b5d329fafee2e55f28d3c709e7b1 was wrong. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/mpegvideo_dec.c | 1 + libavcodec/thread.h | 2 ++ libavcodec/threadframe.h | 2 -- 3 files changed, 3 insertions(+), 2 deletions(-)