History

avcodec/threadframe: Move ff_thread_can_start_frame() to thread.h

It does not use ThreadFrames at all, so thread.h is the correct place. bcb0faeaba60b5d329fafee2e55f28d3c709e7b1 was wrong.

Andreas Rheinhardt committed 3 years ago

Commit 19821131 parent bca26513 files · +3 −2Browse files

Showing the changes to libavcodec (3 of 3 files). Show all

Unified · Split

3 files
  1. libavcodec/mpegvideo_dec.c +1 −0
  2. libavcodec/thread.h +2 −0
  3. libavcodec/threadframe.h +0 −2
libavcodec/mpegvideo_dec.c+1−0
@@ -37,6 +37,7 @@ · 36 unmodified lines
37#include "mpegvideo.h"37#include "mpegvideo.h"
38#include "mpegvideodec.h"38#include "mpegvideodec.h"
39#include "mpeg4videodec.h"39#include "mpeg4videodec.h"
40#include "thread.h"
40#include "threadframe.h"41#include "threadframe.h"
41#include "wmv2dec.h"42#include "wmv2dec.h"
42 43
libavcodec/thread.h+2−0
@@ -52,6 +52,8 @@ void ff_thread_flush(AVCodecContext *avctx); · 51 unmodified lines
52int ff_thread_decode_frame(AVCodecContext *avctx, AVFrame *picture,52int ff_thread_decode_frame(AVCodecContext *avctx, AVFrame *picture,
53 int *got_picture_ptr, AVPacket *avpkt);53 int *got_picture_ptr, AVPacket *avpkt);
54 54
55int ff_thread_can_start_frame(AVCodecContext *avctx);
56
55/**57/**
56 * If the codec defines update_thread_context(), call this58 * If the codec defines update_thread_context(), call this
57 * when they are ready for the next thread to start decoding59 * when they are ready for the next thread to start decoding
libavcodec/threadframe.h+0−2
@@ -87,6 +87,4 @@ int ff_thread_ref_frame(ThreadFrame *dst, const ThreadFrame *src); · 86 unmodified lines
87int ff_thread_replace_frame(AVCodecContext *avctx, ThreadFrame *dst,87int ff_thread_replace_frame(AVCodecContext *avctx, ThreadFrame *dst,
88 const ThreadFrame *src);88 const ThreadFrame *src);
89 89
90int ff_thread_can_start_frame(AVCodecContext *avctx);
91
92#endif90#endif

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t