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
623f380a
Commit
623f380a
authored
Feb 11, 2014
by
James Darnley
Committed by
Michael Niedermayer
Feb 13, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc: fix flac encoder and decoder dependencies
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
0e97ec54
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
3 deletions
+5
-3
Makefile
libavcodec/arm/Makefile
+1
-0
flacdsp_init_arm.c
libavcodec/arm/flacdsp_init_arm.c
+1
-1
flacdsp.c
libavcodec/flacdsp.c
+1
-1
Makefile
libavcodec/x86/Makefile
+1
-0
flacdsp_init.c
libavcodec/x86/flacdsp_init.c
+1
-1
No files found.
libavcodec/arm/Makefile
View file @
623f380a
...
@@ -15,6 +15,7 @@ OBJS-$(CONFIG_FFT) += arm/fft_init_arm.o \
...
@@ -15,6 +15,7 @@ OBJS-$(CONFIG_FFT) += arm/fft_init_arm.o \
arm/fft_fixed_init_arm.o
arm/fft_fixed_init_arm.o
OBJS-$(CONFIG_FLAC_DECODER)
+=
arm/flacdsp_init_arm.o
\
OBJS-$(CONFIG_FLAC_DECODER)
+=
arm/flacdsp_init_arm.o
\
arm/flacdsp_arm.o
arm/flacdsp_arm.o
OBJS-$(CONFIG_FLAC_ENCODER)
+=
arm/flacdsp_init_arm.o
OBJS-$(CONFIG_H264CHROMA)
+=
arm/h264chroma_init_arm.o
OBJS-$(CONFIG_H264CHROMA)
+=
arm/h264chroma_init_arm.o
OBJS-$(CONFIG_H264DSP)
+=
arm/h264dsp_init_arm.o
OBJS-$(CONFIG_H264DSP)
+=
arm/h264dsp_init_arm.o
OBJS-$(CONFIG_H264PRED)
+=
arm/h264pred_init_arm.o
OBJS-$(CONFIG_H264PRED)
+=
arm/h264pred_init_arm.o
...
...
libavcodec/arm/flacdsp_init_arm.c
View file @
623f380a
...
@@ -27,6 +27,6 @@ void ff_flac_lpc_16_arm(int32_t *samples, const int coeffs[32], int order,
...
@@ -27,6 +27,6 @@ void ff_flac_lpc_16_arm(int32_t *samples, const int coeffs[32], int order,
av_cold
void
ff_flacdsp_init_arm
(
FLACDSPContext
*
c
,
enum
AVSampleFormat
fmt
,
av_cold
void
ff_flacdsp_init_arm
(
FLACDSPContext
*
c
,
enum
AVSampleFormat
fmt
,
int
bps
)
int
bps
)
{
{
if
(
bps
<=
16
)
if
(
bps
<=
16
&&
CONFIG_FLAC_DECODER
)
c
->
lpc
=
ff_flac_lpc_16_arm
;
c
->
lpc
=
ff_flac_lpc_16_arm
;
}
}
libavcodec/flacdsp.c
View file @
623f380a
...
@@ -128,6 +128,6 @@ av_cold void ff_flacdsp_init(FLACDSPContext *c, enum AVSampleFormat fmt,
...
@@ -128,6 +128,6 @@ av_cold void ff_flacdsp_init(FLACDSPContext *c, enum AVSampleFormat fmt,
if
(
ARCH_ARM
)
if
(
ARCH_ARM
)
ff_flacdsp_init_arm
(
c
,
fmt
,
bps
);
ff_flacdsp_init_arm
(
c
,
fmt
,
bps
);
if
(
ARCH_X86
&&
CONFIG_FLAC_DECODER
)
if
(
ARCH_X86
)
ff_flacdsp_init_x86
(
c
,
fmt
,
bps
);
ff_flacdsp_init_x86
(
c
,
fmt
,
bps
);
}
}
libavcodec/x86/Makefile
View file @
623f380a
...
@@ -14,6 +14,7 @@ OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc_mmx.o \
...
@@ -14,6 +14,7 @@ OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc_mmx.o \
x86/motion_est.o
x86/motion_est.o
OBJS-$(CONFIG_FFT)
+=
x86/fft_init.o
OBJS-$(CONFIG_FFT)
+=
x86/fft_init.o
OBJS-$(CONFIG_FLAC_DECODER)
+=
x86/flacdsp_init.o
OBJS-$(CONFIG_FLAC_DECODER)
+=
x86/flacdsp_init.o
OBJS-$(CONFIG_FLAC_ENCODER)
+=
x86/flacdsp_init.o
OBJS-$(CONFIG_H263DSP)
+=
x86/h263dsp_init.o
OBJS-$(CONFIG_H263DSP)
+=
x86/h263dsp_init.o
OBJS-$(CONFIG_H264CHROMA)
+=
x86/h264chroma_init.o
OBJS-$(CONFIG_H264CHROMA)
+=
x86/h264chroma_init.o
OBJS-$(CONFIG_H264DSP)
+=
x86/h264dsp_init.o
OBJS-$(CONFIG_H264DSP)
+=
x86/h264dsp_init.o
...
...
libavcodec/x86/flacdsp_init.c
View file @
623f380a
...
@@ -32,7 +32,7 @@ av_cold void ff_flacdsp_init_x86(FLACDSPContext *c, enum AVSampleFormat fmt,
...
@@ -32,7 +32,7 @@ av_cold void ff_flacdsp_init_x86(FLACDSPContext *c, enum AVSampleFormat fmt,
int
cpu_flags
=
av_get_cpu_flags
();
int
cpu_flags
=
av_get_cpu_flags
();
if
(
EXTERNAL_SSE4
(
cpu_flags
))
{
if
(
EXTERNAL_SSE4
(
cpu_flags
))
{
if
(
bps
>
16
)
if
(
bps
>
16
&&
CONFIG_FLAC_DECODER
)
c
->
lpc
=
ff_flac_lpc_32_sse4
;
c
->
lpc
=
ff_flac_lpc_32_sse4
;
}
}
#endif
#endif
...
...
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