mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd'
* commit '051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd':
ogg: Provide aliases for Speex, Opus and audio-only ogg
Conflicts:
Changelog
libavformat/oggenc.c
libavformat/version.h
See: 2ccc6ff03a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
commit
300d489ac9
|
|
@ -2407,7 +2407,9 @@ mpegtsraw_demuxer_select="mpegts_demuxer"
|
|||
mxf_d10_muxer_select="mxf_muxer"
|
||||
nut_muxer_select="riffenc"
|
||||
nuv_demuxer_select="riffdec"
|
||||
oga_muxer_select="ogg_muxer"
|
||||
ogg_demuxer_select="golomb"
|
||||
opus_muxer_select="ogg_muxer"
|
||||
psp_muxer_select="mov_muxer"
|
||||
rtp_demuxer_select="sdp_demuxer"
|
||||
rtpdec_select="asf_demuxer rm_demuxer rtp_protocol mpegts_demuxer mov_demuxer"
|
||||
|
|
@ -2418,6 +2420,7 @@ sap_muxer_select="rtp_muxer rtp_protocol rtpenc_chain"
|
|||
sdp_demuxer_select="rtpdec"
|
||||
smoothstreaming_muxer_select="ismv_muxer"
|
||||
spdif_muxer_select="aac_parser"
|
||||
spx_muxer_select="ogg_muxer"
|
||||
tak_demuxer_select="tak_parser"
|
||||
tg2_muxer_select="mov_muxer"
|
||||
tgp_muxer_select="mov_muxer"
|
||||
|
|
|
|||
|
|
@ -274,8 +274,8 @@ void av_register_all(void)
|
|||
REGISTER_DEMUXER (SMUSH, smush);
|
||||
REGISTER_DEMUXER (SOL, sol);
|
||||
REGISTER_MUXDEMUX(SOX, sox);
|
||||
REGISTER_MUXER (SPX, spx);
|
||||
REGISTER_MUXDEMUX(SPDIF, spdif);
|
||||
REGISTER_MUXER (SPEEX, speex);
|
||||
REGISTER_MUXDEMUX(SRT, srt);
|
||||
REGISTER_DEMUXER (STR, str);
|
||||
REGISTER_DEMUXER (SUBVIEWER1, subviewer1);
|
||||
|
|
|
|||
|
|
@ -650,7 +650,7 @@ AVOutputFormat ff_ogg_muxer = {
|
|||
.long_name = NULL_IF_CONFIG_SMALL("Ogg"),
|
||||
.mime_type = "application/ogg",
|
||||
.extensions = "ogg,ogv"
|
||||
#if !CONFIG_SPEEX_MUXER
|
||||
#if !CONFIG_SPX_MUXER
|
||||
",spx"
|
||||
#endif
|
||||
#if !CONFIG_OPUS_MUXER
|
||||
|
|
@ -679,47 +679,46 @@ static const AVClass oga_muxer_class = {
|
|||
|
||||
AVOutputFormat ff_oga_muxer = {
|
||||
.name = "oga",
|
||||
.long_name = NULL_IF_CONFIG_SMALL("Ogg audio"),
|
||||
.long_name = NULL_IF_CONFIG_SMALL("Ogg Audio"),
|
||||
.mime_type = "audio/ogg",
|
||||
.extensions = "oga",
|
||||
.priv_data_size = sizeof(OGGContext),
|
||||
.audio_codec = AV_CODEC_ID_VORBIS,
|
||||
.video_codec = AV_CODEC_ID_NONE,
|
||||
.audio_codec = CONFIG_LIBVORBIS_ENCODER ?
|
||||
AV_CODEC_ID_VORBIS : AV_CODEC_ID_FLAC,
|
||||
.write_header = ogg_write_header,
|
||||
.write_packet = ogg_write_packet,
|
||||
.write_trailer = ogg_write_trailer,
|
||||
.flags = AVFMT_TS_NEGATIVE,
|
||||
.flags = AVFMT_TS_NEGATIVE | AVFMT_ALLOW_FLUSH,
|
||||
.priv_class = &oga_muxer_class,
|
||||
};
|
||||
#endif
|
||||
|
||||
#if CONFIG_SPEEX_MUXER
|
||||
static const AVClass speex_muxer_class = {
|
||||
.class_name = "Speex muxer",
|
||||
#if CONFIG_SPX_MUXER
|
||||
static const AVClass spx_muxer_class = {
|
||||
.class_name = "Ogg Speex muxer",
|
||||
.item_name = av_default_item_name,
|
||||
.option = options,
|
||||
.version = LIBAVUTIL_VERSION_INT,
|
||||
};
|
||||
|
||||
AVOutputFormat ff_speex_muxer = {
|
||||
.name = "speex",
|
||||
.long_name = NULL_IF_CONFIG_SMALL("Speex"),
|
||||
AVOutputFormat ff_spx_muxer = {
|
||||
.name = "spx",
|
||||
.long_name = NULL_IF_CONFIG_SMALL("Ogg Speex"),
|
||||
.mime_type = "audio/ogg",
|
||||
.extensions = "spx",
|
||||
.priv_data_size = sizeof(OGGContext),
|
||||
.audio_codec = AV_CODEC_ID_SPEEX,
|
||||
.video_codec = AV_CODEC_ID_NONE,
|
||||
.write_header = ogg_write_header,
|
||||
.write_packet = ogg_write_packet,
|
||||
.write_trailer = ogg_write_trailer,
|
||||
.flags = AVFMT_TS_NEGATIVE,
|
||||
.priv_class = &speex_muxer_class,
|
||||
.flags = AVFMT_TS_NEGATIVE | AVFMT_ALLOW_FLUSH,
|
||||
.priv_class = &spx_muxer_class,
|
||||
};
|
||||
#endif
|
||||
|
||||
#if CONFIG_OPUS_MUXER
|
||||
static const AVClass opus_muxer_class = {
|
||||
.class_name = "Opus muxer",
|
||||
.class_name = "Ogg Opus muxer",
|
||||
.item_name = av_default_item_name,
|
||||
.option = options,
|
||||
.version = LIBAVUTIL_VERSION_INT,
|
||||
|
|
@ -727,16 +726,15 @@ static const AVClass opus_muxer_class = {
|
|||
|
||||
AVOutputFormat ff_opus_muxer = {
|
||||
.name = "opus",
|
||||
.long_name = NULL_IF_CONFIG_SMALL("Opus"),
|
||||
.long_name = NULL_IF_CONFIG_SMALL("Ogg Opus"),
|
||||
.mime_type = "audio/ogg",
|
||||
.extensions = "opus",
|
||||
.priv_data_size = sizeof(OGGContext),
|
||||
.audio_codec = AV_CODEC_ID_OPUS,
|
||||
.video_codec = AV_CODEC_ID_NONE,
|
||||
.write_header = ogg_write_header,
|
||||
.write_packet = ogg_write_packet,
|
||||
.write_trailer = ogg_write_trailer,
|
||||
.flags = AVFMT_TS_NEGATIVE,
|
||||
.flags = AVFMT_TS_NEGATIVE | AVFMT_ALLOW_FLUSH,
|
||||
.priv_class = &opus_muxer_class,
|
||||
};
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
#include "libavutil/version.h"
|
||||
|
||||
#define LIBAVFORMAT_VERSION_MAJOR 56
|
||||
#define LIBAVFORMAT_VERSION_MINOR 1
|
||||
#define LIBAVFORMAT_VERSION_MINOR 2
|
||||
#define LIBAVFORMAT_VERSION_MICRO 100
|
||||
|
||||
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
|
||||
|
|
|
|||
Loading…
Reference in New Issue