From 0ffbc258aa00b3cd88ff9c8d141a7661655b4571 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Mon, 2 Mar 2009 05:18:33 +0000
Subject: [PATCH] Change a bunch of codec long_names to be more consistent and
 descriptive.

Originally committed as revision 17716 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/adpcm.c          | 2 +-
 libavcodec/adxdec.c         | 2 +-
 libavcodec/adxenc.c         | 2 +-
 libavcodec/eacmv.c          | 2 +-
 libavcodec/eatgq.c          | 2 +-
 libavcodec/eatgv.c          | 2 +-
 libavcodec/h263dec.c        | 4 ++--
 libavcodec/interplayvideo.c | 2 +-
 libavcodec/mlpdec.c         | 2 +-
 libavcodec/motionpixels.c   | 2 +-
 libavcodec/mpegvideo_enc.c  | 2 +-
 libavcodec/nellymoserenc.c  | 2 +-
 libavcodec/nuv.c            | 2 +-
 libavformat/mp3.c           | 2 +-
 14 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index 76f50b9739..5b3f11c2ec 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -1672,7 +1672,7 @@ ADPCM_DECODER(CODEC_ID_ADPCM_IMA_EA_SEAD, adpcm_ima_ea_sead, "IMA Electronic Art
 ADPCM_DECODER(CODEC_ID_ADPCM_IMA_ISS, adpcm_ima_iss, "IMA Funcom ISS ADPCM");
 ADPCM_CODEC  (CODEC_ID_ADPCM_IMA_QT, adpcm_ima_qt, "IMA QuickTime ADPCM");
 ADPCM_DECODER(CODEC_ID_ADPCM_IMA_SMJPEG, adpcm_ima_smjpeg, "IMA Loki SDL MJPEG ADPCM");
-ADPCM_CODEC  (CODEC_ID_ADPCM_IMA_WAV, adpcm_ima_wav, "IMA Wav ADPCM");
+ADPCM_CODEC  (CODEC_ID_ADPCM_IMA_WAV, adpcm_ima_wav, "IMA WAV ADPCM");
 ADPCM_DECODER(CODEC_ID_ADPCM_IMA_WS, adpcm_ima_ws, "IMA Westwood ADPCM");
 ADPCM_CODEC  (CODEC_ID_ADPCM_MS, adpcm_ms, "Microsoft ADPCM");
 ADPCM_DECODER(CODEC_ID_ADPCM_SBPRO_2, adpcm_sbpro_2, "Sound Blaster Pro 2-bit ADPCM");
diff --git a/libavcodec/adxdec.c b/libavcodec/adxdec.c
index 486516b9ab..0af26013bb 100644
--- a/libavcodec/adxdec.c
+++ b/libavcodec/adxdec.c
@@ -173,6 +173,6 @@ AVCodec adpcm_adx_decoder = {
     NULL,
     NULL,
     adx_decode_frame,
-    .long_name = NULL_IF_CONFIG_SMALL("SEGA CRI ADX"),
+    .long_name = NULL_IF_CONFIG_SMALL("SEGA CRI ADX ADPCM"),
 };
 
diff --git a/libavcodec/adxenc.c b/libavcodec/adxenc.c
index 37e632d9ed..7c5a95d564 100644
--- a/libavcodec/adxenc.c
+++ b/libavcodec/adxenc.c
@@ -193,5 +193,5 @@ AVCodec adpcm_adx_encoder = {
     adx_encode_close,
     NULL,
     .sample_fmts = (enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE},
-    .long_name = NULL_IF_CONFIG_SMALL("SEGA CRI ADX"),
+    .long_name = NULL_IF_CONFIG_SMALL("SEGA CRI ADX ADPCM"),
 };
diff --git a/libavcodec/eacmv.c b/libavcodec/eacmv.c
index 4ab5a61bed..18321aada5 100644
--- a/libavcodec/eacmv.c
+++ b/libavcodec/eacmv.c
@@ -211,5 +211,5 @@ AVCodec eacmv_decoder = {
     cmv_decode_end,
     cmv_decode_frame,
     CODEC_CAP_DR1,
-    .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts CMV Video"),
+    .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts CMV video"),
 };
diff --git a/libavcodec/eatgq.c b/libavcodec/eatgq.c
index 12645c5a78..dd833f52c9 100644
--- a/libavcodec/eatgq.c
+++ b/libavcodec/eatgq.c
@@ -251,5 +251,5 @@ AVCodec eatgq_decoder = {
     tgq_decode_end,
     tgq_decode_frame,
     CODEC_CAP_DR1,
-    .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TGQ Video"),
+    .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TGQ video"),
 };
diff --git a/libavcodec/eatgv.c b/libavcodec/eatgv.c
index af34ed7d47..90e3ebf489 100644
--- a/libavcodec/eatgv.c
+++ b/libavcodec/eatgv.c
@@ -336,5 +336,5 @@ AVCodec eatgv_decoder = {
     NULL,
     tgv_decode_end,
     tgv_decode_frame,
-    .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TGV Video"),
+    .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TGV video"),
 };
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index 3cca95d3ba..4d03223856 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -754,7 +754,7 @@ AVCodec h263_decoder = {
     ff_h263_decode_frame,
     CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY,
     .flush= ff_mpeg_flush,
-    .long_name= NULL_IF_CONFIG_SMALL("H.263 / H.263-1996, H.263+ / H.263-1998"),
+    .long_name= NULL_IF_CONFIG_SMALL("H.263 / H.263-1996, H.263+ / H.263-1998 / H.263 version 2"),
     .pix_fmts= ff_hwaccel_pixfmt_list_420,
 };
 
@@ -838,6 +838,6 @@ AVCodec flv_decoder = {
     ff_h263_decode_end,
     ff_h263_decode_frame,
     CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
-    .long_name= NULL_IF_CONFIG_SMALL("Flash Video"),
+    .long_name= NULL_IF_CONFIG_SMALL("Flash Video (FLV)"),
     .pix_fmts= ff_pixfmt_list_420,
 };
diff --git a/libavcodec/interplayvideo.c b/libavcodec/interplayvideo.c
index 83a9a47ef9..2fbc6a1829 100644
--- a/libavcodec/interplayvideo.c
+++ b/libavcodec/interplayvideo.c
@@ -942,5 +942,5 @@ AVCodec interplay_video_decoder = {
     ipvideo_decode_end,
     ipvideo_decode_frame,
     CODEC_CAP_DR1,
-    .long_name = NULL_IF_CONFIG_SMALL("Interplay MVE Video"),
+    .long_name = NULL_IF_CONFIG_SMALL("Interplay MVE video"),
 };
diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
index d2e98e42f2..99754b329c 100644
--- a/libavcodec/mlpdec.c
+++ b/libavcodec/mlpdec.c
@@ -1047,6 +1047,6 @@ AVCodec mlp_decoder = {
     NULL,
     NULL,
     read_access_unit,
-    .long_name = NULL_IF_CONFIG_SMALL("Meridian Lossless Packing"),
+    .long_name = NULL_IF_CONFIG_SMALL("MLP (Meridian Lossless Packing)/TrueHD"),
 };
 
diff --git a/libavcodec/motionpixels.c b/libavcodec/motionpixels.c
index 01a94546d2..f69dcf95fe 100644
--- a/libavcodec/motionpixels.c
+++ b/libavcodec/motionpixels.c
@@ -359,5 +359,5 @@ AVCodec motionpixels_decoder = {
     mp_decode_end,
     mp_decode_frame,
     CODEC_CAP_DR1,
-    .long_name = NULL_IF_CONFIG_SMALL("Motion Pixels Video"),
+    .long_name = NULL_IF_CONFIG_SMALL("Motion Pixels video"),
 };
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 3176c2f076..2500a410c6 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -3748,7 +3748,7 @@ AVCodec flv_encoder = {
     MPV_encode_picture,
     MPV_encode_end,
     .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
-    .long_name= NULL_IF_CONFIG_SMALL("Flash Video"),
+    .long_name= NULL_IF_CONFIG_SMALL("Flash Video (FLV)"),
 };
 
 AVCodec rv10_encoder = {
diff --git a/libavcodec/nellymoserenc.c b/libavcodec/nellymoserenc.c
index 9167313ef2..fe1a886d7f 100644
--- a/libavcodec/nellymoserenc.c
+++ b/libavcodec/nellymoserenc.c
@@ -390,5 +390,5 @@ AVCodec nellymoser_encoder = {
     .encode = encode_frame,
     .close = encode_end,
     .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY,
-    .long_name = NULL_IF_CONFIG_SMALL("Nellymoser Asao Codec"),
+    .long_name = NULL_IF_CONFIG_SMALL("Nellymoser Asao"),
 };
diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c
index 08f4b79b95..109ef41a8c 100644
--- a/libavcodec/nuv.c
+++ b/libavcodec/nuv.c
@@ -280,6 +280,6 @@ AVCodec nuv_decoder = {
     decode_end,
     decode_frame,
     CODEC_CAP_DR1,
-    .long_name = NULL_IF_CONFIG_SMALL("NuppelVideo"),
+    .long_name = NULL_IF_CONFIG_SMALL("NuppelVideo/RTJPEG"),
 };
 
diff --git a/libavformat/mp3.c b/libavformat/mp3.c
index a887c3da8d..fa383d6512 100644
--- a/libavformat/mp3.c
+++ b/libavformat/mp3.c
@@ -657,7 +657,7 @@ static int mp3_write_trailer(struct AVFormatContext *s)
 #if CONFIG_MP3_DEMUXER
 AVInputFormat mp3_demuxer = {
     "mp3",
-    NULL_IF_CONFIG_SMALL("MPEG audio"),
+    NULL_IF_CONFIG_SMALL("MPEG audio layer 2/3"),
     0,
     mp3_read_probe,
     mp3_read_header,