Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
e259dc86
Commit
e259dc86
authored
Mar 25, 2016
by
Kieran Kunhya
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec: Remove libdcadec, we already have it merged internally
parent
c50be7a5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
2 additions
and
319 deletions
+2
-319
Changelog
Changelog
+1
-1
configure
configure
+0
-4
Makefile
libavcodec/Makefile
+0
-1
allcodecs.c
libavcodec/allcodecs.c
+0
-1
libdcadec.c
libavcodec/libdcadec.c
+0
-311
version.h
libavcodec/version.h
+1
-1
No files found.
Changelog
View file @
e259dc86
...
...
@@ -16,7 +16,7 @@ version <next>:
- AudioToolbox audio decoders
- AudioToolbox audio encoders
- coreimage filter (GPU based image filtering on OSX)
- libdcadec removed
version 3.0:
- Common Encryption (CENC) MP4 encoding and decoding support
...
...
configure
View file @
e259dc86
...
...
@@ -219,7 +219,6 @@ External library support:
--enable-libcdio enable audio CD grabbing with libcdio [no]
--enable-libdc1394 enable IIDC-1394 grabbing using libdc1394
and libraw1394 [no]
--enable-libdcadec enable DCA decoding via libdcadec [no]
--enable-libfaac enable AAC encoding via libfaac [no]
--enable-libfdk-aac enable AAC de/encoding via libfdk-aac [no]
--enable-libflite enable flite (voice synthesis) support via libflite [no]
...
...
@@ -1468,7 +1467,6 @@ EXTERNAL_LIBRARY_LIST="
libcdio
libcelt
libdc1394
libdcadec
libfaac
libfdk_aac
libflite
...
...
@@ -2674,7 +2672,6 @@ pcm_mulaw_at_encoder_select="audio_frame_queue"
chromaprint_muxer_deps
=
"chromaprint"
h264_videotoolbox_encoder_deps
=
"videotoolbox_encoder pthreads"
libcelt_decoder_deps
=
"libcelt"
libdcadec_decoder_deps
=
"libdcadec"
libfaac_encoder_deps
=
"libfaac"
libfaac_encoder_select
=
"audio_frame_queue"
libfdk_aac_decoder_deps
=
"libfdk_aac"
...
...
@@ -5535,7 +5532,6 @@ enabled libcelt && require libcelt celt/celt.h celt_decode -lcelt0 &&
{
check_lib celt/celt.h celt_decoder_create_custom
-lcelt0
||
die
"ERROR: libcelt must be installed and version must be >= 0.11.0."
;
}
enabled libcaca
&&
require_pkg_config caca caca.h caca_create_canvas
enabled libdcadec
&&
require_pkg_config
"dcadec >= 0.1.0"
libdcadec/dca_context.h dcadec_context_create
enabled libfaac
&&
require2 libfaac
"stdint.h faac.h"
faacEncGetVersion
-lfaac
enabled libfdk_aac
&&
{
use_pkg_config fdk-aac
"fdk-aac/aacenc_lib.h"
aacEncOpen
||
{
require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen
-lfdk-aac
&&
...
...
libavcodec/Makefile
View file @
e259dc86
...
...
@@ -821,7 +821,6 @@ 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
OBJS-$(CONFIG_LIBFDK_AAC_DECODER)
+=
libfdk-aacdec.o
OBJS-$(CONFIG_LIBFDK_AAC_ENCODER)
+=
libfdk-aacenc.o
...
...
libavcodec/allcodecs.c
View file @
e259dc86
...
...
@@ -578,7 +578,6 @@ void avcodec_register_all(void)
REGISTER_DECODER
(
QDMC_AT
,
qdmc_at
);
REGISTER_DECODER
(
QDM2_AT
,
qdm2_at
);
REGISTER_DECODER
(
LIBCELT
,
libcelt
);
REGISTER_DECODER
(
LIBDCADEC
,
libdcadec
)
REGISTER_ENCODER
(
LIBFAAC
,
libfaac
);
REGISTER_ENCDEC
(
LIBFDK_AAC
,
libfdk_aac
);
REGISTER_ENCDEC
(
LIBGSM
,
libgsm
);
...
...
libavcodec/libdcadec.c
deleted
100644 → 0
View file @
c50be7a5
This diff is collapsed.
Click to expand it.
libavcodec/version.h
View file @
e259dc86
...
...
@@ -28,7 +28,7 @@
#include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 57
#define LIBAVCODEC_VERSION_MINOR 3
0
#define LIBAVCODEC_VERSION_MINOR 3
1
#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