Commit 9f4aa353 authored by Diego Biurrun's avatar Diego Biurrun

missing codec long names by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13185 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent ee83232a
...@@ -204,5 +204,6 @@ AVCodec libdirac_decoder = { ...@@ -204,5 +204,6 @@ AVCodec libdirac_decoder = {
libdirac_decode_close, libdirac_decode_close,
libdirac_decode_frame, libdirac_decode_frame,
CODEC_CAP_DELAY, CODEC_CAP_DELAY,
.flush = libdirac_flush .flush = libdirac_flush,
.long_name = "libdirac Dirac 2.2",
} ; } ;
...@@ -370,4 +370,5 @@ AVCodec libdirac_encoder = { ...@@ -370,4 +370,5 @@ AVCodec libdirac_encoder = {
libdirac_encode_close, libdirac_encode_close,
.capabilities= CODEC_CAP_DELAY, .capabilities= CODEC_CAP_DELAY,
.pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_YUV444P, -1}, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_YUV444P, -1},
.long_name= "libdirac Dirac 2.2",
} ; } ;
...@@ -315,7 +315,7 @@ static av_cold int faac_decode_init(AVCodecContext *avctx) ...@@ -315,7 +315,7 @@ static av_cold int faac_decode_init(AVCodecContext *avctx)
return 0; return 0;
} }
#define AAC_CODEC(id, name) \ #define AAC_CODEC(id, name, long_name_) \
AVCodec name ## _decoder = { \ AVCodec name ## _decoder = { \
#name, \ #name, \
CODEC_TYPE_AUDIO, \ CODEC_TYPE_AUDIO, \
...@@ -325,13 +325,14 @@ AVCodec name ## _decoder = { \ ...@@ -325,13 +325,14 @@ AVCodec name ## _decoder = { \
NULL, \ NULL, \
faac_decode_end, \ faac_decode_end, \
faac_decode_frame, \ faac_decode_frame, \
.long_name = long_name_, \
} }
// FIXME - raw AAC files - maybe just one entry will be enough // 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 LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
// If it's mp4 file - usually embeded into Qt Mov // 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 #endif
#undef AAC_CODEC #undef AAC_CODEC
...@@ -304,5 +304,6 @@ AVCodec libschroedinger_decoder = { ...@@ -304,5 +304,6 @@ AVCodec libschroedinger_decoder = {
libschroedinger_decode_close, libschroedinger_decode_close,
libschroedinger_decode_frame, libschroedinger_decode_frame,
CODEC_CAP_DELAY, CODEC_CAP_DELAY,
.flush = libschroedinger_flush .flush = libschroedinger_flush,
.long_name = "libschroedinger Dirac 2.2",
}; };
...@@ -384,4 +384,5 @@ AVCodec libschroedinger_encoder = { ...@@ -384,4 +384,5 @@ AVCodec libschroedinger_encoder = {
libschroedinger_encode_close, libschroedinger_encode_close,
.capabilities= CODEC_CAP_DELAY, .capabilities= CODEC_CAP_DELAY,
.pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_YUV444P, PIX_FMT_NONE}, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_YUV444P, PIX_FMT_NONE},
.long_name= "libschroedinger Dirac 2.2",
}; };
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