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
b0c026a2
Commit
b0c026a2
authored
Apr 09, 2016
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf/rawenc: Add a raw gsm muxer.
parent
56cb465b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
2 deletions
+17
-2
Makefile
libavformat/Makefile
+1
-0
allformats.c
libavformat/allformats.c
+1
-1
rawenc.c
libavformat/rawenc.c
+14
-0
version.h
libavformat/version.h
+1
-1
No files found.
libavformat/Makefile
View file @
b0c026a2
...
...
@@ -181,6 +181,7 @@ OBJS-$(CONFIG_FSB_DEMUXER) += fsb.o
OBJS-$(CONFIG_GIF_MUXER)
+=
gif.o
OBJS-$(CONFIG_GIF_DEMUXER)
+=
gifdec.o
OBJS-$(CONFIG_GSM_DEMUXER)
+=
gsmdec.o
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
...
...
libavformat/allformats.c
View file @
b0c026a2
...
...
@@ -139,7 +139,7 @@ void av_register_all(void)
REGISTER_DEMUXER
(
G729
,
g729
);
REGISTER_DEMUXER
(
GENH
,
genh
);
REGISTER_MUXDEMUX
(
GIF
,
gif
);
REGISTER_
DEMUXER
(
GSM
,
gsm
);
REGISTER_
MUXDEMUX
(
GSM
,
gsm
);
REGISTER_MUXDEMUX
(
GXF
,
gxf
);
REGISTER_MUXDEMUX
(
H261
,
h261
);
REGISTER_MUXDEMUX
(
H263
,
h263
);
...
...
libavformat/rawenc.c
View file @
b0c026a2
...
...
@@ -193,6 +193,20 @@ AVOutputFormat ff_g723_1_muxer = {
};
#endif
#if CONFIG_GSM_MUXER
AVOutputFormat
ff_gsm_muxer
=
{
.
name
=
"gsm"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"raw GSM"
),
.
mime_type
=
"audio/x-gsm"
,
.
extensions
=
"gsm"
,
.
audio_codec
=
AV_CODEC_ID_GSM
,
.
video_codec
=
AV_CODEC_ID_NONE
,
.
write_header
=
force_one_stream
,
.
write_packet
=
ff_raw_write_packet
,
.
flags
=
AVFMT_NOTIMESTAMPS
,
};
#endif
#if CONFIG_H261_MUXER
AVOutputFormat
ff_h261_muxer
=
{
.
name
=
"h261"
,
...
...
libavformat/version.h
View file @
b0c026a2
...
...
@@ -30,7 +30,7 @@
#include "libavutil/version.h"
#define LIBAVFORMAT_VERSION_MAJOR 57
#define LIBAVFORMAT_VERSION_MINOR 3
1
#define LIBAVFORMAT_VERSION_MINOR 3
2
#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