Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
a8bb81a0
Commit
a8bb81a0
authored
Dec 07, 2015
by
Clément Bœsch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc, lavu: use avutil/thread.h instead of redundant conditional includes
parent
a0050d9b
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
6 additions
and
52 deletions
+6
-52
frame_thread_encoder.c
libavcodec/frame_thread_encoder.c
+1
-8
pthread_frame.c
libavcodec/pthread_frame.c
+1
-8
utils.c
libavcodec/utils.c
+1
-8
vp8.h
libavcodec/vp8.h
+1
-8
opencl.c
libavutil/opencl.c
+1
-9
threadmessage.c
libavutil/threadmessage.c
+1
-11
No files found.
libavcodec/frame_thread_encoder.c
View file @
a8bb81a0
...
@@ -23,18 +23,11 @@
...
@@ -23,18 +23,11 @@
#include "libavutil/fifo.h"
#include "libavutil/fifo.h"
#include "libavutil/avassert.h"
#include "libavutil/avassert.h"
#include "libavutil/imgutils.h"
#include "libavutil/imgutils.h"
#include "libavutil/thread.h"
#include "avcodec.h"
#include "avcodec.h"
#include "internal.h"
#include "internal.h"
#include "thread.h"
#include "thread.h"
#if HAVE_PTHREADS
#include <pthread.h>
#elif HAVE_W32THREADS
#include "compat/w32pthreads.h"
#elif HAVE_OS2THREADS
#include "compat/os2threads.h"
#endif
#define MAX_THREADS 64
#define MAX_THREADS 64
#define BUFFER_SIZE (2*MAX_THREADS)
#define BUFFER_SIZE (2*MAX_THREADS)
...
...
libavcodec/pthread_frame.c
View file @
a8bb81a0
...
@@ -26,14 +26,6 @@
...
@@ -26,14 +26,6 @@
#include <stdint.h>
#include <stdint.h>
#if HAVE_PTHREADS
#include <pthread.h>
#elif HAVE_W32THREADS
#include "compat/w32pthreads.h"
#elif HAVE_OS2THREADS
#include "compat/os2threads.h"
#endif
#include "avcodec.h"
#include "avcodec.h"
#include "internal.h"
#include "internal.h"
#include "pthread_internal.h"
#include "pthread_internal.h"
...
@@ -49,6 +41,7 @@
...
@@ -49,6 +41,7 @@
#include "libavutil/log.h"
#include "libavutil/log.h"
#include "libavutil/mem.h"
#include "libavutil/mem.h"
#include "libavutil/opt.h"
#include "libavutil/opt.h"
#include "libavutil/thread.h"
/**
/**
* Context used by codec threads and stored in their AVCodecInternal thread_ctx.
* Context used by codec threads and stored in their AVCodecInternal thread_ctx.
...
...
libavcodec/utils.c
View file @
a8bb81a0
...
@@ -41,6 +41,7 @@
...
@@ -41,6 +41,7 @@
#include "libavutil/imgutils.h"
#include "libavutil/imgutils.h"
#include "libavutil/samplefmt.h"
#include "libavutil/samplefmt.h"
#include "libavutil/dict.h"
#include "libavutil/dict.h"
#include "libavutil/thread.h"
#include "avcodec.h"
#include "avcodec.h"
#include "libavutil/opt.h"
#include "libavutil/opt.h"
#include "me_cmp.h"
#include "me_cmp.h"
...
@@ -59,14 +60,6 @@
...
@@ -59,14 +60,6 @@
# include <iconv.h>
# include <iconv.h>
#endif
#endif
#if HAVE_PTHREADS
#include <pthread.h>
#elif HAVE_W32THREADS
#include "compat/w32pthreads.h"
#elif HAVE_OS2THREADS
#include "compat/os2threads.h"
#endif
#include "libavutil/ffversion.h"
#include "libavutil/ffversion.h"
const
char
av_codec_ffversion
[]
=
"FFmpeg version "
FFMPEG_VERSION
;
const
char
av_codec_ffversion
[]
=
"FFmpeg version "
FFMPEG_VERSION
;
...
...
libavcodec/vp8.h
View file @
a8bb81a0
...
@@ -27,20 +27,13 @@
...
@@ -27,20 +27,13 @@
#define AVCODEC_VP8_H
#define AVCODEC_VP8_H
#include "libavutil/buffer.h"
#include "libavutil/buffer.h"
#include "libavutil/thread.h"
#include "h264pred.h"
#include "h264pred.h"
#include "thread.h"
#include "thread.h"
#include "vp56.h"
#include "vp56.h"
#include "vp8dsp.h"
#include "vp8dsp.h"
#if HAVE_PTHREADS
# include <pthread.h>
#elif HAVE_OS2THREADS
# include "compat/os2threads.h"
#elif HAVE_W32THREADS
# include "compat/w32pthreads.h"
#endif
#define VP8_MAX_QUANT 127
#define VP8_MAX_QUANT 127
enum
dct_token
{
enum
dct_token
{
...
...
libavutil/opencl.c
View file @
a8bb81a0
...
@@ -26,15 +26,7 @@
...
@@ -26,15 +26,7 @@
#include "log.h"
#include "log.h"
#include "avassert.h"
#include "avassert.h"
#include "opt.h"
#include "opt.h"
#include "thread.h"
#if HAVE_THREADS
#if HAVE_PTHREADS
#include <pthread.h>
#elif HAVE_W32THREADS
#include "compat/w32pthreads.h"
#elif HAVE_OS2THREADS
#include "compat/os2threads.h"
#endif
#include "atomic.h"
#include "atomic.h"
static
pthread_mutex_t
*
volatile
atomic_opencl_lock
=
NULL
;
static
pthread_mutex_t
*
volatile
atomic_opencl_lock
=
NULL
;
...
...
libavutil/threadmessage.c
View file @
a8bb81a0
...
@@ -20,17 +20,7 @@
...
@@ -20,17 +20,7 @@
#include "fifo.h"
#include "fifo.h"
#include "threadmessage.h"
#include "threadmessage.h"
#if HAVE_THREADS
#include "thread.h"
#if HAVE_PTHREADS
#include <pthread.h>
#elif HAVE_W32THREADS
#include "compat/w32pthreads.h"
#elif HAVE_OS2THREADS
#include "compat/os2threads.h"
#else
#error "Unknown threads implementation"
#endif
#endif
struct
AVThreadMessageQueue
{
struct
AVThreadMessageQueue
{
#if HAVE_THREADS
#if HAVE_THREADS
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment