Commit bde15e74 authored by Stefano Sabatini's avatar Stefano Sabatini Committed by Diego Biurrun
Browse files

Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.

patch by Stefano Sabatini, stefano.sabatini-lala poste.it
along with some spelling/consistency fixes for the long names by me

Originally committed as revision 13649 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent ca162a50
......@@ -315,7 +315,7 @@ static int audio_read_close(AVFormatContext *s1)
#ifdef CONFIG_OSS_DEMUXER
AVInputFormat oss_demuxer = {
"oss",
"audio grab and output",
NULL_IF_CONFIG_SMALL("audio grab and output"),
sizeof(AudioData),
NULL,
audio_read_header,
......@@ -328,7 +328,7 @@ AVInputFormat oss_demuxer = {
#ifdef CONFIG_OSS_MUXER
AVOutputFormat oss_muxer = {
"oss",
"audio grab and output",
NULL_IF_CONFIG_SMALL("audio grab and output"),
"",
"",
sizeof(AudioData),
......
......@@ -311,7 +311,7 @@ static int grab_read_close(AVFormatContext *s1)
AVInputFormat bktr_demuxer = {
"bktr",
"video grab",
NULL_IF_CONFIG_SMALL("video grab"),
sizeof(VideoData),
NULL,
grab_read_header,
......
......@@ -228,7 +228,7 @@ static int dv1394_close(AVFormatContext * context)
AVInputFormat dv1394_demuxer = {
.name = "dv1394",
.long_name = "dv1394 A/V grab",
.long_name = NULL_IF_CONFIG_SMALL("DV1394 A/V grab"),
.priv_data_size = sizeof(struct dv1394_data),
.read_header = dv1394_read_header,
.read_packet = dv1394_read_packet,
......
......@@ -350,7 +350,7 @@ static int dc1394_v2_close(AVFormatContext * context)
AVInputFormat libdc1394_demuxer = {
.name = "libdc1394",
.long_name = "dc1394 v.2 A/V grab",
.long_name = NULL_IF_CONFIG_SMALL("dc1394 v.2 A/V grab"),
.priv_data_size = sizeof(struct dc1394_data),
.read_header = dc1394_v2_read_header,
.read_packet = dc1394_v2_read_packet,
......@@ -362,7 +362,7 @@ AVInputFormat libdc1394_demuxer = {
#if ENABLE_LIBDC1394_1
AVInputFormat libdc1394_demuxer = {
.name = "libdc1394",
.long_name = "dc1394 v.1 A/V grab",
.long_name = NULL_IF_CONFIG_SMALL("dc1394 v.1 A/V grab"),
.priv_data_size = sizeof(struct dc1394_data),
.read_header = dc1394_v1_read_header,
.read_packet = dc1394_v1_read_packet,
......
......@@ -346,7 +346,7 @@ static int grab_read_close(AVFormatContext *s1)
AVInputFormat v4l_demuxer = {
"video4linux",
"video grab",
NULL_IF_CONFIG_SMALL("video grab"),
sizeof(VideoData),
NULL,
grab_read_header,
......
......@@ -635,7 +635,7 @@ static int v4l2_read_close(AVFormatContext *s1)
AVInputFormat v4l2_demuxer = {
"video4linux2",
"video grab",
NULL_IF_CONFIG_SMALL("video grab"),
sizeof(struct video_data),
NULL,
v4l2_read_header,
......
......@@ -456,7 +456,7 @@ static int vfw_read_close(AVFormatContext *s)
AVInputFormat vfwcap_demuxer = {
"vfwcap",
"VFW video capture",
NULL_IF_CONFIG_SMALL("VFW video capture"),
sizeof(struct vfw_ctx),
NULL,
vfw_read_header,
......
......@@ -519,7 +519,7 @@ x11grab_read_close(AVFormatContext *s1)
AVInputFormat x11_grab_device_demuxer =
{
"x11grab",
"X11grab",
NULL_IF_CONFIG_SMALL("X11grab"),
sizeof(x11_grab_t),
NULL,
x11grab_read_header,
......
......@@ -328,7 +328,7 @@ static int fourxm_read_close(AVFormatContext *s)
AVInputFormat fourxm_demuxer = {
"4xm",
"4X Technologies format",
NULL_IF_CONFIG_SMALL("4X Technologies format"),
sizeof(FourxmDemuxContext),
fourxm_probe,
fourxm_read_header,
......
......@@ -107,7 +107,7 @@ static int adts_write_packet(AVFormatContext *s, AVPacket *pkt)
AVOutputFormat adts_muxer = {
"adts",
"ADTS AAC",
NULL_IF_CONFIG_SMALL("ADTS AAC"),
"audio/aac",
"aac",
sizeof(ADTSContext),
......
......@@ -442,7 +442,7 @@ static int aiff_read_seek(AVFormatContext *s,
#ifdef CONFIG_AIFF_DEMUXER
AVInputFormat aiff_demuxer = {
"aiff",
"Audio IFF",
NULL_IF_CONFIG_SMALL("Audio IFF"),
0,
aiff_probe,
aiff_read_header,
......@@ -456,7 +456,7 @@ AVInputFormat aiff_demuxer = {
#ifdef CONFIG_AIFF_MUXER
AVOutputFormat aiff_muxer = {
"aiff",
"Audio IFF",
NULL_IF_CONFIG_SMALL("Audio IFF"),
"audio/aiff",
"aif,aiff,afc,aifc",
sizeof(AIFFOutputContext),
......
......@@ -169,7 +169,7 @@ static int amr_read_packet(AVFormatContext *s,
#ifdef CONFIG_AMR_DEMUXER
AVInputFormat amr_demuxer = {
"amr",
"3gpp amr file format",
NULL_IF_CONFIG_SMALL("3GPP AMR file format"),
0, /*priv_data_size*/
amr_probe,
amr_read_header,
......@@ -181,7 +181,7 @@ AVInputFormat amr_demuxer = {
#ifdef CONFIG_AMR_MUXER
AVOutputFormat amr_muxer = {
"amr",
"3gpp amr file format",
NULL_IF_CONFIG_SMALL("3GPP AMR file format"),
"audio/amr",
"amr",
0,
......
......@@ -82,7 +82,7 @@ static int apc_read_packet(AVFormatContext *s, AVPacket *pkt)
AVInputFormat apc_demuxer = {
"apc",
"CRYO APC format",
NULL_IF_CONFIG_SMALL("CRYO APC format"),
0,
apc_probe,
apc_read_header,
......
......@@ -511,7 +511,7 @@ static int ape_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
AVInputFormat ape_demuxer = {
"ape",
"Monkey's Audio",
NULL_IF_CONFIG_SMALL("Monkey's Audio"),
sizeof(APEContext),
ape_probe,
ape_read_header,
......
......@@ -815,7 +815,7 @@ static int asf_write_trailer(AVFormatContext *s)
#ifdef CONFIG_ASF_MUXER
AVOutputFormat asf_muxer = {
"asf",
"asf format",
NULL_IF_CONFIG_SMALL("ASF format"),
"video/x-ms-asf",
"asf,wmv,wma",
sizeof(ASFContext),
......@@ -836,7 +836,7 @@ AVOutputFormat asf_muxer = {
#ifdef CONFIG_ASF_STREAM_MUXER
AVOutputFormat asf_stream_muxer = {
"asf_stream",
"asf format",
NULL_IF_CONFIG_SMALL("ASF format"),
"video/x-ms-asf",
"asf,wmv,wma",
sizeof(ASFContext),
......
......@@ -1094,7 +1094,7 @@ static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int
AVInputFormat asf_demuxer = {
"asf",
"asf format",
NULL_IF_CONFIG_SMALL("ASF format"),
sizeof(ASFContext),
asf_probe,
asf_read_header,
......
......@@ -180,7 +180,7 @@ static int au_read_close(AVFormatContext *s)
#ifdef CONFIG_AU_DEMUXER
AVInputFormat au_demuxer = {
"au",
"SUN AU Format",
NULL_IF_CONFIG_SMALL("SUN AU format"),
0,
au_probe,
au_read_header,
......@@ -194,7 +194,7 @@ AVInputFormat au_demuxer = {
#ifdef CONFIG_AU_MUXER
AVOutputFormat au_muxer = {
"au",
"SUN AU Format",
NULL_IF_CONFIG_SMALL("SUN AU format"),
"audio/basic",
"au",
0,
......
......@@ -185,6 +185,11 @@ typedef struct AVFormatParameters {
typedef struct AVOutputFormat {
const char *name;
/**
* Descriptive name for the format, meant to be more human-readable
* than \p name. You \e should use the NULL_IF_CONFIG_SMALL() macro
* to define it.
*/
const char *long_name;
const char *mime_type;
const char *extensions; /**< comma separated filename extensions */
......@@ -216,6 +221,11 @@ typedef struct AVOutputFormat {
typedef struct AVInputFormat {
const char *name;
/**
* Descriptive name for the format, meant to be more human-readable
* than \p name. You \e should use the NULL_IF_CONFIG_SMALL() macro
* to define it.
*/
const char *long_name;
/** size of private data so that it can be allocated in the wrapper */
int priv_data_size;
......
......@@ -1087,7 +1087,7 @@ static int avi_probe(AVProbeData *p)
AVInputFormat avi_demuxer = {
"avi",
"avi format",
NULL_IF_CONFIG_SMALL("AVI format"),
sizeof(AVIContext),
avi_probe,
avi_read_header,
......
......@@ -593,7 +593,7 @@ static int avi_write_trailer(AVFormatContext *s)
AVOutputFormat avi_muxer = {
"avi",
"avi format",
NULL_IF_CONFIG_SMALL("AVI format"),
"video/x-msvideo",
"avi",
sizeof(AVIContext),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment