From 6140271f545698b7084bb5e02c0cac25e5304289 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Tue, 29 Apr 2008 07:24:44 +0000 Subject: [PATCH] Add some long names to AVCodec declarations. patch by Stefano Sabatini, stefano.sabatini-lala poste it Originally committed as revision 13017 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/dv.c | 4 +++- libavcodec/flicvideo.c | 3 ++- libavcodec/h263dec.c | 4 ++++ libavcodec/h264.c | 1 + libavcodec/libgsm.c | 4 ++++ libavcodec/libx264.c | 3 ++- libavcodec/libxvidff.c | 1 + libavcodec/ljpegenc.c | 1 + libavcodec/mjpegbdec.c | 3 ++- libavcodec/mpeg12.c | 4 ++++ libavcodec/mpeg12enc.c | 2 ++ libavcodec/mpegvideo_enc.c | 4 ++++ libavcodec/msrle.c | 1 + libavcodec/truemotion1.c | 1 + libavcodec/truemotion2.c | 1 + libavcodec/ws-snd1.c | 1 + 16 files changed, 34 insertions(+), 4 deletions(-) diff --git a/libavcodec/dv.c b/libavcodec/dv.c index 3983381..6037113 100644 --- a/libavcodec/dv.c +++ b/libavcodec/dv.c @@ -1240,6 +1240,7 @@ AVCodec dvvideo_encoder = { dvvideo_init, dvvideo_encode_frame, .pix_fmts = (enum PixelFormat[]) {PIX_FMT_YUV411P, PIX_FMT_YUV422P, PIX_FMT_YUV420P, -1}, + .long_name = "DV (Digital Video)", }; #endif // CONFIG_DVVIDEO_ENCODER @@ -1254,6 +1255,7 @@ AVCodec dvvideo_decoder = { dvvideo_close, dvvideo_decode_frame, CODEC_CAP_DR1, - NULL + NULL, + .long_name = "DV (Digital Video)", }; #endif diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c index 0a4ea6c..ea1d8c4 100644 --- a/libavcodec/flicvideo.c +++ b/libavcodec/flicvideo.c @@ -749,5 +749,6 @@ AVCodec flic_decoder = { NULL, NULL, NULL, - NULL + NULL, + .long_name = "Autodesk Animator Flic video", }; diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 4ecac28..28cd932 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -723,6 +723,7 @@ AVCodec mpeg4_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= "MPEG-4 part 2", }; AVCodec h263_decoder = { @@ -749,6 +750,7 @@ AVCodec msmpeg4v1_decoder = { ff_h263_decode_end, ff_h263_decode_frame, CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, + .long_name="MPEG-4 part 2 Microsoft variant version 1", }; AVCodec msmpeg4v2_decoder = { @@ -761,6 +763,7 @@ AVCodec msmpeg4v2_decoder = { ff_h263_decode_end, ff_h263_decode_frame, CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, + .long_name=" MPEG-4 part 2 Microsoft variant version 2", }; AVCodec msmpeg4v3_decoder = { @@ -773,6 +776,7 @@ AVCodec msmpeg4v3_decoder = { ff_h263_decode_end, ff_h263_decode_frame, CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, + .long_name="MPEG-4 part 2 Microsoft variant version 3", }; AVCodec wmv1_decoder = { diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 219c687..2d660fe 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -8087,6 +8087,7 @@ AVCodec h264_decoder = { decode_frame, /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, .flush= flush_dpb, + .long_name = "H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10", }; #include "svq3.c" diff --git a/libavcodec/libgsm.c b/libavcodec/libgsm.c index 995b467..2e62a31 100644 --- a/libavcodec/libgsm.c +++ b/libavcodec/libgsm.c @@ -106,6 +106,7 @@ AVCodec libgsm_encoder = { libgsm_init, libgsm_encode_frame, libgsm_close, + .long_name = "libgsm GSM", }; AVCodec libgsm_ms_encoder = { @@ -116,6 +117,7 @@ AVCodec libgsm_ms_encoder = { libgsm_init, libgsm_encode_frame, libgsm_close, + .long_name = "libgsm GSM Microsoft variant", }; static int libgsm_decode_frame(AVCodecContext *avctx, @@ -145,6 +147,7 @@ AVCodec libgsm_decoder = { NULL, libgsm_close, libgsm_decode_frame, + .long_name = "libgsm GSM", }; AVCodec libgsm_ms_decoder = { @@ -156,4 +159,5 @@ AVCodec libgsm_ms_decoder = { NULL, libgsm_close, libgsm_decode_frame, + .long_name = "libgsm GSM Microsoft variant", }; diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index e730bfe..2e3a88e 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -296,5 +296,6 @@ AVCodec libx264_encoder = { .encode = X264_frame, .close = X264_close, .capabilities = CODEC_CAP_DELAY, - .pix_fmts = (enum PixelFormat[]) { PIX_FMT_YUV420P, -1 } + .pix_fmts = (enum PixelFormat[]) { PIX_FMT_YUV420P, -1 }, + .long_name = "libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10", }; diff --git a/libavcodec/libxvidff.c b/libavcodec/libxvidff.c index acac29b..a97e0da 100644 --- a/libavcodec/libxvidff.c +++ b/libavcodec/libxvidff.c @@ -774,4 +774,5 @@ AVCodec libxvid_encoder = { ff_xvid_encode_frame, ff_xvid_encode_close, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, + .long_name= "libxvidcore MPEG-4 part 2", }; diff --git a/libavcodec/ljpegenc.c b/libavcodec/ljpegenc.c index 0e71739..cbe1afc 100644 --- a/libavcodec/ljpegenc.c +++ b/libavcodec/ljpegenc.c @@ -194,4 +194,5 @@ AVCodec ljpeg_encoder = { //FIXME avoid MPV_* lossless JPEG should not need them MPV_encode_init, encode_picture_lossless, MPV_encode_end, + .long_name = "Lossless JPEG", }; diff --git a/libavcodec/mjpegbdec.c b/libavcodec/mjpegbdec.c index a6c409a..99d39a4 100644 --- a/libavcodec/mjpegbdec.c +++ b/libavcodec/mjpegbdec.c @@ -145,5 +145,6 @@ AVCodec mjpegb_decoder = { ff_mjpeg_decode_end, mjpegb_decode_frame, CODEC_CAP_DR1, - NULL + NULL, + .long_name = "Apple MJPEG-B", }; diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 96d37c7..282d147 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -2442,6 +2442,7 @@ AVCodec mpeg1video_decoder = { mpeg_decode_frame, CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, .flush= ff_mpeg_flush, + .long_name= "MPEG-1 video", }; AVCodec mpeg2video_decoder = { @@ -2455,6 +2456,7 @@ AVCodec mpeg2video_decoder = { mpeg_decode_frame, CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, .flush= ff_mpeg_flush, + .long_name= "MPEG-2 video", }; //legacy decoder @@ -2469,6 +2471,7 @@ AVCodec mpegvideo_decoder = { mpeg_decode_frame, CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, .flush= ff_mpeg_flush, + .long_name= "MPEG-1 video", }; #ifdef HAVE_XVMC @@ -2502,6 +2505,7 @@ AVCodec mpeg_xvmc_decoder = { mpeg_decode_frame, CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED| CODEC_CAP_HWACCEL | CODEC_CAP_DELAY, .flush= ff_mpeg_flush, + .long_name = "MPEG-1 video XvMC (X-Video Motion Compensation)", }; #endif diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index 6d62ccb..4aaa097 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -938,6 +938,7 @@ AVCodec mpeg1video_encoder = { .supported_framerates= ff_frame_rate_tab+1, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, .capabilities= CODEC_CAP_DELAY, + .long_name= "MPEG-1 video", }; AVCodec mpeg2video_encoder = { @@ -951,4 +952,5 @@ AVCodec mpeg2video_encoder = { .supported_framerates= ff_frame_rate_tab+1, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, -1}, .capabilities= CODEC_CAP_DELAY, + .long_name= "MPEG-2 video", }; diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 12c660e..af6e43b 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -3805,6 +3805,7 @@ AVCodec mpeg4_encoder = { MPV_encode_end, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, .capabilities= CODEC_CAP_DELAY, + .long_name= "MPEG-4 part 2", }; AVCodec msmpeg4v1_encoder = { @@ -3816,6 +3817,7 @@ AVCodec msmpeg4v1_encoder = { MPV_encode_picture, MPV_encode_end, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, + .long_name= "MPEG-4 part 2 Microsoft variant version 1", }; AVCodec msmpeg4v2_encoder = { @@ -3827,6 +3829,7 @@ AVCodec msmpeg4v2_encoder = { MPV_encode_picture, MPV_encode_end, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, + .long_name= "MPEG-4 part 2 Microsoft variant version 2", }; AVCodec msmpeg4v3_encoder = { @@ -3838,6 +3841,7 @@ AVCodec msmpeg4v3_encoder = { MPV_encode_picture, MPV_encode_end, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, + .long_name= "MPEG-4 part 2 Microsoft variant version 3", }; AVCodec wmv1_encoder = { diff --git a/libavcodec/msrle.c b/libavcodec/msrle.c index f9f0373..a55b578 100644 --- a/libavcodec/msrle.c +++ b/libavcodec/msrle.c @@ -304,4 +304,5 @@ AVCodec msrle_decoder = { msrle_decode_end, msrle_decode_frame, CODEC_CAP_DR1, + .long_name= "Microsoft RLE", }; diff --git a/libavcodec/truemotion1.c b/libavcodec/truemotion1.c index d825ba1..c2b8c1d 100644 --- a/libavcodec/truemotion1.c +++ b/libavcodec/truemotion1.c @@ -899,4 +899,5 @@ AVCodec truemotion1_decoder = { truemotion1_decode_end, truemotion1_decode_frame, CODEC_CAP_DR1, + .long_name = "Duck TrueMotion 1.0", }; diff --git a/libavcodec/truemotion2.c b/libavcodec/truemotion2.c index 26a4b49..22a9ebb 100644 --- a/libavcodec/truemotion2.c +++ b/libavcodec/truemotion2.c @@ -887,4 +887,5 @@ AVCodec truemotion2_decoder = { decode_end, decode_frame, CODEC_CAP_DR1, + .long_name = "Duck TrueMotion 2.0", }; diff --git a/libavcodec/ws-snd1.c b/libavcodec/ws-snd1.c index 6858b09..dc6ef37 100644 --- a/libavcodec/ws-snd1.c +++ b/libavcodec/ws-snd1.c @@ -149,4 +149,5 @@ AVCodec ws_snd1_decoder = { NULL, NULL, ws_snd_decode_frame, + .long_name = "Westwood Audio (SND1)", }; -- 2.7.4