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

8 files changed, 10 insertions, 10 deletions

diff --git a/libavdevice/audio.c b/libavdevice/audio.c
index 6be3ce1037..4fcd3afea0 100644
--- a/libavdevice/audio.c
+++ b/libavdevice/audio.c
@@ -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),
diff --git a/libavdevice/bktr.c b/libavdevice/bktr.c
index 364e296658..7b37f11159 100644
--- a/libavdevice/bktr.c
+++ b/libavdevice/bktr.c
@@ -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,
diff --git a/libavdevice/dv1394.c b/libavdevice/dv1394.c
index 8562652e93..56e61223e6 100644
--- a/libavdevice/dv1394.c
+++ b/libavdevice/dv1394.c
@@ -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,
diff --git a/libavdevice/libdc1394.c b/libavdevice/libdc1394.c
index 7be079e937..1457d8c81a 100644
--- a/libavdevice/libdc1394.c
+++ b/libavdevice/libdc1394.c
@@ -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,
diff --git a/libavdevice/v4l.c b/libavdevice/v4l.c
index 20dd53bc32..2f7fc6a1b8 100644
--- a/libavdevice/v4l.c
+++ b/libavdevice/v4l.c
@@ -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,
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index 95eea3cd92..de5bf78ca5 100644
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@ -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,
diff --git a/libavdevice/vfwcap.c b/libavdevice/vfwcap.c
index 5963e6242e..be6003a422 100644
--- a/libavdevice/vfwcap.c
+++ b/libavdevice/vfwcap.c
@@ -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,
diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c
index f1375f6deb..4e1a49943a 100644
--- a/libavdevice/x11grab.c
+++ b/libavdevice/x11grab.c
@@ -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,