virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit 'f9f34cb9983ec6f4ef119c34b726d3b39c143110'

Browse Source 
* commit 'f9f34cb9983ec6f4ef119c34b726d3b39c143110':
  ogg: Use separate classes for the aliases

Conflicts:
	libavformat/oggenc.c

See: 2ccc6ff03a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-23 21:39:14 +02:00
commit 9bff8cfc91
1 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libavformat/oggenc.c
View File

@ -86,6 +86,14 @@ static const AVOption options[] = {
{ NULL }, { NULL },
}; };
#define OGG_CLASS(flavor, name)\
static const AVClass flavor ## _muxer_class = {\
.class_name = #name " muxer",\
.item_name = av_default_item_name,\
.option = options,\
.version = LIBAVUTIL_VERSION_INT,\
};
static void ogg_update_checksum(AVFormatContext *s, AVIOContext *pb, int64_t crc_offset) static void ogg_update_checksum(AVFormatContext *s, AVIOContext *pb, int64_t crc_offset)
{ {
int64_t pos = avio_tell(pb); int64_t pos = avio_tell(pb);
@ -638,13 +646,7 @@ static int ogg_write_trailer(AVFormatContext *s)
} }
#if CONFIG_OGG_MUXER #if CONFIG_OGG_MUXER
static const AVClass ogg_muxer_class = { OGG_CLASS(ogg, Ogg)
.class_name = "Ogg muxer",
.item_name = av_default_item_name,
.option = options,
.version = LIBAVUTIL_VERSION_INT,
};
AVOutputFormat ff_ogg_muxer = { AVOutputFormat ff_ogg_muxer = {
.name = "ogg", .name = "ogg",
.long_name = NULL_IF_CONFIG_SMALL("Ogg"), .long_name = NULL_IF_CONFIG_SMALL("Ogg"),
@ -670,13 +672,7 @@ AVOutputFormat ff_ogg_muxer = {
#endif #endif
#if CONFIG_OGA_MUXER #if CONFIG_OGA_MUXER
static const AVClass oga_muxer_class = { OGG_CLASS(oga, Ogg audio)
.class_name = "Ogg audio muxer",
.item_name = av_default_item_name,
.option = options,
.version = LIBAVUTIL_VERSION_INT,
};
AVOutputFormat ff_oga_muxer = { AVOutputFormat ff_oga_muxer = {
.name = "oga", .name = "oga",
.long_name = NULL_IF_CONFIG_SMALL("Ogg Audio"), .long_name = NULL_IF_CONFIG_SMALL("Ogg Audio"),
@ -694,13 +690,7 @@ AVOutputFormat ff_oga_muxer = {
#endif #endif
#if CONFIG_SPX_MUXER #if CONFIG_SPX_MUXER
static const AVClass spx_muxer_class = { OGG_CLASS(spx, Ogg Speex)
.class_name = "Ogg Speex muxer",
.item_name = av_default_item_name,
.option = options,
.version = LIBAVUTIL_VERSION_INT,
};
AVOutputFormat ff_spx_muxer = { AVOutputFormat ff_spx_muxer = {
.name = "spx", .name = "spx",
.long_name = NULL_IF_CONFIG_SMALL("Ogg Speex"), .long_name = NULL_IF_CONFIG_SMALL("Ogg Speex"),
@ -717,13 +707,7 @@ AVOutputFormat ff_spx_muxer = {
#endif #endif
#if CONFIG_OPUS_MUXER #if CONFIG_OPUS_MUXER
static const AVClass opus_muxer_class = { OGG_CLASS(opus, Ogg Opus)
.class_name = "Ogg Opus muxer",
.item_name = av_default_item_name,
.option = options,
.version = LIBAVUTIL_VERSION_INT,
};
AVOutputFormat ff_opus_muxer = { AVOutputFormat ff_opus_muxer = {
.name = "opus", .name = "opus",
.long_name = NULL_IF_CONFIG_SMALL("Ogg Opus"), .long_name = NULL_IF_CONFIG_SMALL("Ogg Opus"),