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
65cff814
Commit
65cff814
authored
Feb 24, 2016
by
Rodger Combs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc: add AudioToolbox encoders
Fixes trac #4828
parent
d5d32805
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
22 additions
and
6 deletions
+22
-6
Changelog
Changelog
+1
-0
configure
configure
+10
-0
Makefile
libavcodec/Makefile
+5
-0
allcodecs.c
libavcodec/allcodecs.c
+5
-5
audiotoolboxenc.c
libavcodec/audiotoolboxenc.c
+0
-0
version.h
libavcodec/version.h
+1
-1
No files found.
Changelog
View file @
65cff814
...
...
@@ -14,6 +14,7 @@ version <next>:
- MediaCodec H264 decoding
- VC-2 HQ RTP payload format (draft v1) depacketizer
- AudioToolbox audio decoders
- AudioToolbox audio encoders
version 3.0:
...
...
configure
View file @
65cff814
...
...
@@ -2661,6 +2661,16 @@ pcm_alaw_at_decoder_deps="audiotoolbox"
pcm_mulaw_at_decoder_deps
=
"audiotoolbox"
qdmc_at_decoder_deps
=
"audiotoolbox"
qdm2_at_decoder_deps
=
"audiotoolbox"
aac_at_encoder_deps
=
"audiotoolbox"
aac_at_encoder_select
=
"audio_frame_queue"
alac_at_encoder_deps
=
"audiotoolbox"
alac_at_encoder_select
=
"audio_frame_queue"
ilbc_at_encoder_deps
=
"audiotoolbox"
ilbc_at_encoder_select
=
"audio_frame_queue"
pcm_alaw_at_encoder_deps
=
"audiotoolbox"
pcm_alaw_at_encoder_select
=
"audio_frame_queue"
pcm_mulaw_at_encoder_deps
=
"audiotoolbox"
pcm_mulaw_at_encoder_select
=
"audio_frame_queue"
chromaprint_muxer_deps
=
"chromaprint"
h264_videotoolbox_encoder_deps
=
"videotoolbox_encoder pthreads"
libcelt_decoder_deps
=
"libcelt"
...
...
libavcodec/Makefile
View file @
65cff814
...
...
@@ -815,6 +815,11 @@ OBJS-$(CONFIG_PCM_MULAW_AT_DECODER) += audiotoolboxdec.o
OBJS-$(CONFIG_PCM_ALAW_AT_DECODER)
+=
audiotoolboxdec.o
OBJS-$(CONFIG_QDMC_AT_DECODER)
+=
audiotoolboxdec.o
OBJS-$(CONFIG_QDM2_AT_DECODER)
+=
audiotoolboxdec.o
OBJS-$(CONFIG_AAC_AT_ENCODER)
+=
audiotoolboxenc.o
OBJS-$(CONFIG_ALAC_AT_ENCODER)
+=
audiotoolboxenc.o
OBJS-$(CONFIG_ILBC_AT_ENCODER)
+=
audiotoolboxenc.o
OBJS-$(CONFIG_PCM_ALAW_AT_ENCODER)
+=
audiotoolboxenc.o
OBJS-$(CONFIG_PCM_MULAW_AT_ENCODER)
+=
audiotoolboxenc.o
OBJS-$(CONFIG_LIBCELT_DECODER)
+=
libcelt_dec.o
OBJS-$(CONFIG_LIBDCADEC_DECODER)
+=
libdcadec.o
dca.o
OBJS-$(CONFIG_LIBFAAC_ENCODER)
+=
libfaac.o
...
...
libavcodec/allcodecs.c
View file @
65cff814
...
...
@@ -563,18 +563,18 @@ void avcodec_register_all(void)
REGISTER_ENCDEC
(
XSUB
,
xsub
);
/* external libraries */
REGISTER_
DECODER
(
AAC_AT
,
aac_at
);
REGISTER_
ENCDEC
(
AAC_AT
,
aac_at
);
REGISTER_DECODER
(
AC3_AT
,
ac3_at
);
REGISTER_DECODER
(
ADPCM_IMA_QT_AT
,
adpcm_ima_qt_at
);
REGISTER_
DECODER
(
ALAC_AT
,
alac_at
);
REGISTER_
ENCDEC
(
ALAC_AT
,
alac_at
);
REGISTER_DECODER
(
AMR_NB_AT
,
amr_nb_at
);
REGISTER_DECODER
(
GSM_MS_AT
,
gsm_ms_at
);
REGISTER_
DECODER
(
ILBC_AT
,
ilbc_at
);
REGISTER_
ENCDEC
(
ILBC_AT
,
ilbc_at
);
REGISTER_DECODER
(
MP1_AT
,
mp1_at
);
REGISTER_DECODER
(
MP2_AT
,
mp2_at
);
REGISTER_DECODER
(
MP3_AT
,
mp3_at
);
REGISTER_
DECODER
(
PCM_ALAW_AT
,
pcm_alaw_at
);
REGISTER_
DECODER
(
PCM_MULAW_AT
,
pcm_mulaw_at
);
REGISTER_
ENCDEC
(
PCM_ALAW_AT
,
pcm_alaw_at
);
REGISTER_
ENCDEC
(
PCM_MULAW_AT
,
pcm_mulaw_at
);
REGISTER_DECODER
(
QDMC_AT
,
qdmc_at
);
REGISTER_DECODER
(
QDM2_AT
,
qdm2_at
);
REGISTER_DECODER
(
LIBCELT
,
libcelt
);
...
...
libavcodec/audiotoolboxenc.c
0 → 100644
View file @
65cff814
This diff is collapsed.
Click to expand it.
libavcodec/version.h
View file @
65cff814
...
...
@@ -28,7 +28,7 @@
#include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 57
#define LIBAVCODEC_VERSION_MINOR
29
#define LIBAVCODEC_VERSION_MINOR
30
#define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
...
...
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