You've already forked FFmpeg
							
							
				mirror of
				https://github.com/FFmpeg/FFmpeg.git
				synced 2025-10-30 23:18:11 +02:00 
			
		
		
		
	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
This commit is contained in:
		| @@ -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"); | ||||
|   | ||||
| @@ -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"), | ||||
| }; | ||||
|  | ||||
|   | ||||
| @@ -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"), | ||||
| }; | ||||
|   | ||||
| @@ -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"), | ||||
| }; | ||||
|   | ||||
| @@ -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"), | ||||
| }; | ||||
|   | ||||
| @@ -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"), | ||||
| }; | ||||
|   | ||||
| @@ -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, | ||||
| }; | ||||
|   | ||||
| @@ -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"), | ||||
| }; | ||||
|   | ||||
| @@ -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"), | ||||
| }; | ||||
|  | ||||
|   | ||||
| @@ -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"), | ||||
| }; | ||||
|   | ||||
| @@ -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 = { | ||||
|   | ||||
| @@ -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"), | ||||
| }; | ||||
|   | ||||
| @@ -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"), | ||||
| }; | ||||
|  | ||||
|   | ||||
| @@ -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, | ||||
|   | ||||
		Reference in New Issue
	
	Block a user