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
9d494c5e
Commit
9d494c5e
authored
Aug 26, 2017
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf/rawenc: Add little- and big-endian G.726 muxers.
parent
9d6aab6f
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
32 additions
and
6 deletions
+32
-6
Changelog
Changelog
+1
-1
Makefile
libavformat/Makefile
+4
-2
allformats.c
libavformat/allformats.c
+2
-2
rawenc.c
libavformat/rawenc.c
+24
-0
version.h
libavformat/version.h
+1
-1
No files found.
Changelog
View file @
9d494c5e
...
...
@@ -33,7 +33,7 @@ version <next>:
- tlut2 video filter
- floodfill video filter
- pseudocolor video filter
- raw G.726 demuxer, left- and right-justified
- raw G.726
muxer and
demuxer, left- and right-justified
version 3.3:
- CrystalHD decoder moved to new decode API
...
...
libavformat/Makefile
View file @
9d494c5e
...
...
@@ -188,11 +188,13 @@ OBJS-$(CONFIG_GSM_MUXER) += rawenc.o
OBJS-$(CONFIG_GXF_DEMUXER)
+=
gxf.o
OBJS-$(CONFIG_GXF_MUXER)
+=
gxfenc.o
audiointerleave.o
OBJS-$(CONFIG_G722_DEMUXER)
+=
g722.o
rawdec.o
OBJS-$(CONFIG_G726_DEMUXER)
+=
g726.o
OBJS-$(CONFIG_G726LE_DEMUXER)
+=
g726.o
OBJS-$(CONFIG_G722_MUXER)
+=
rawenc.o
OBJS-$(CONFIG_G723_1_DEMUXER)
+=
g723_1.o
OBJS-$(CONFIG_G723_1_MUXER)
+=
rawenc.o
OBJS-$(CONFIG_G726_DEMUXER)
+=
g726.o
OBJS-$(CONFIG_G726_MUXER)
+=
rawenc.o
OBJS-$(CONFIG_G726LE_DEMUXER)
+=
g726.o
OBJS-$(CONFIG_G726LE_MUXER)
+=
rawenc.o
OBJS-$(CONFIG_G729_DEMUXER)
+=
g729dec.o
OBJS-$(CONFIG_GDV_DEMUXER)
+=
gdv.o
OBJS-$(CONFIG_GENH_DEMUXER)
+=
genh.o
...
...
libavformat/allformats.c
View file @
9d494c5e
...
...
@@ -132,9 +132,9 @@ static void register_all(void)
REGISTER_DEMUXER
(
FRM
,
frm
);
REGISTER_DEMUXER
(
FSB
,
fsb
);
REGISTER_MUXDEMUX
(
G722
,
g722
);
REGISTER_DEMUXER
(
G726
,
g726
);
REGISTER_DEMUXER
(
G726LE
,
g726le
);
REGISTER_MUXDEMUX
(
G723_1
,
g723_1
);
REGISTER_MUXDEMUX
(
G726
,
g726
);
REGISTER_MUXDEMUX
(
G726LE
,
g726le
);
REGISTER_DEMUXER
(
G729
,
g729
);
REGISTER_DEMUXER
(
GDV
,
gdv
);
REGISTER_DEMUXER
(
GENH
,
genh
);
...
...
libavformat/rawenc.c
View file @
9d494c5e
...
...
@@ -196,6 +196,30 @@ AVOutputFormat ff_g723_1_muxer = {
};
#endif
#if CONFIG_G726_MUXER
AVOutputFormat
ff_g726_muxer
=
{
.
name
=
"g726"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"raw big-endian G.726 (
\"
left-justified
\"
)"
),
.
audio_codec
=
AV_CODEC_ID_ADPCM_G726
,
.
video_codec
=
AV_CODEC_ID_NONE
,
.
write_header
=
force_one_stream
,
.
write_packet
=
ff_raw_write_packet
,
.
flags
=
AVFMT_NOTIMESTAMPS
,
};
#endif
#if CONFIG_G726LE_MUXER
AVOutputFormat
ff_g726le_muxer
=
{
.
name
=
"g726le"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"raw little-endian G.726 (
\"
right-justified
\"
)"
),
.
audio_codec
=
AV_CODEC_ID_ADPCM_G726LE
,
.
video_codec
=
AV_CODEC_ID_NONE
,
.
write_header
=
force_one_stream
,
.
write_packet
=
ff_raw_write_packet
,
.
flags
=
AVFMT_NOTIMESTAMPS
,
};
#endif
#if CONFIG_GSM_MUXER
AVOutputFormat
ff_gsm_muxer
=
{
.
name
=
"gsm"
,
...
...
libavformat/version.h
View file @
9d494c5e
...
...
@@ -32,7 +32,7 @@
// Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium)
// Also please add any ticket numbers that you believe might be affected here
#define LIBAVFORMAT_VERSION_MAJOR 57
#define LIBAVFORMAT_VERSION_MINOR 7
7
#define LIBAVFORMAT_VERSION_MINOR 7
8
#define LIBAVFORMAT_VERSION_MICRO 100
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_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