From 9f4aa353599b0c12c7364fd9fe80132da96f3eb7 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sat, 17 May 2008 10:20:01 +0000 Subject: [PATCH] missing codec long names by Stefano Sabatini, stefano.sabatini-lala poste it Originally committed as revision 13185 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/libdiracdec.c | 3 ++- libavcodec/libdiracenc.c | 1 + libavcodec/libfaad.c | 7 ++++--- libavcodec/libschroedingerdec.c | 3 ++- libavcodec/libschroedingerenc.c | 1 + 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libavcodec/libdiracdec.c b/libavcodec/libdiracdec.c index 5054a1cf1a..6ef4ef1bd1 100644 --- a/libavcodec/libdiracdec.c +++ b/libavcodec/libdiracdec.c @@ -204,5 +204,6 @@ AVCodec libdirac_decoder = { libdirac_decode_close, libdirac_decode_frame, CODEC_CAP_DELAY, - .flush = libdirac_flush + .flush = libdirac_flush, + .long_name = "libdirac Dirac 2.2", } ; diff --git a/libavcodec/libdiracenc.c b/libavcodec/libdiracenc.c index e2c3188718..e8d03144e6 100644 --- a/libavcodec/libdiracenc.c +++ b/libavcodec/libdiracenc.c @@ -370,4 +370,5 @@ AVCodec libdirac_encoder = { libdirac_encode_close, .capabilities= CODEC_CAP_DELAY, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_YUV444P, -1}, + .long_name= "libdirac Dirac 2.2", } ; diff --git a/libavcodec/libfaad.c b/libavcodec/libfaad.c index 1e1bf68eb7..32f06ac8f8 100644 --- a/libavcodec/libfaad.c +++ b/libavcodec/libfaad.c @@ -315,7 +315,7 @@ static av_cold int faac_decode_init(AVCodecContext *avctx) return 0; } -#define AAC_CODEC(id, name) \ +#define AAC_CODEC(id, name, long_name_) \ AVCodec name ## _decoder = { \ #name, \ CODEC_TYPE_AUDIO, \ @@ -325,13 +325,14 @@ AVCodec name ## _decoder = { \ NULL, \ faac_decode_end, \ faac_decode_frame, \ + .long_name = long_name_, \ } // FIXME - raw AAC files - maybe just one entry will be enough -AAC_CODEC(CODEC_ID_AAC, libfaad); +AAC_CODEC(CODEC_ID_AAC, libfaad, "libfaad AAC (Advanced Audio Codec)"); #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) // If it's mp4 file - usually embeded into Qt Mov -AAC_CODEC(CODEC_ID_MPEG4AAC, mpeg4aac); +AAC_CODEC(CODEC_ID_MPEG4AAC, mpeg4aac, "libfaad AAC (Advanced Audio Codec)"); #endif #undef AAC_CODEC diff --git a/libavcodec/libschroedingerdec.c b/libavcodec/libschroedingerdec.c index b03df79c4b..5a07899db6 100644 --- a/libavcodec/libschroedingerdec.c +++ b/libavcodec/libschroedingerdec.c @@ -304,5 +304,6 @@ AVCodec libschroedinger_decoder = { libschroedinger_decode_close, libschroedinger_decode_frame, CODEC_CAP_DELAY, - .flush = libschroedinger_flush + .flush = libschroedinger_flush, + .long_name = "libschroedinger Dirac 2.2", }; diff --git a/libavcodec/libschroedingerenc.c b/libavcodec/libschroedingerenc.c index 516b881113..c8958620d9 100644 --- a/libavcodec/libschroedingerenc.c +++ b/libavcodec/libschroedingerenc.c @@ -384,4 +384,5 @@ AVCodec libschroedinger_encoder = { libschroedinger_encode_close, .capabilities= CODEC_CAP_DELAY, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_YUV444P, PIX_FMT_NONE}, + .long_name= "libschroedinger Dirac 2.2", };