You've already forked FFmpeg
							
							
				mirror of
				https://github.com/FFmpeg/FFmpeg.git
				synced 2025-10-30 23:18:11 +02:00 
			
		
		
		
	add missing wmapro decoder parts
Originally committed as revision 19752 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
		| @@ -36,6 +36,7 @@ version <next>: | ||||
| - TwinVQ decoder | ||||
| - Bluray (PGS) subtitle decoder | ||||
| - LPCM support in MPEG-TS (HDMV RID as found on Blu-ray disks) | ||||
| - Wmapro decoder | ||||
|  | ||||
|  | ||||
|  | ||||
|   | ||||
| @@ -621,6 +621,7 @@ following image formats are supported: | ||||
| @item Westwood Audio (SND1)  @tab     @tab  X | ||||
| @item Windows Media Audio 1  @tab  X  @tab  X | ||||
| @item Windows Media Audio 2  @tab  X  @tab  X | ||||
| @item Windows Media Audio Pro @tab    @tab  X | ||||
| @end multitable | ||||
|  | ||||
| @code{X} means that encoding (resp. decoding) is supported. | ||||
|   | ||||
| @@ -249,6 +249,7 @@ OBJS-$(CONFIG_VP5_DECODER)             += vp5.o vp56.o vp56data.o vp3dsp.o | ||||
| OBJS-$(CONFIG_VP6_DECODER)             += vp6.o vp56.o vp56data.o vp3dsp.o vp6dsp.o huffman.o | ||||
| OBJS-$(CONFIG_VQA_DECODER)             += vqavideo.o | ||||
| OBJS-$(CONFIG_WAVPACK_DECODER)         += wavpack.o | ||||
| OBJS-$(CONFIG_WMAPRO_DECODER)          += wmaprodec.o wma.o | ||||
| OBJS-$(CONFIG_WMAV1_DECODER)           += wmadec.o wma.o | ||||
| OBJS-$(CONFIG_WMAV1_ENCODER)           += wmaenc.o wma.o | ||||
| OBJS-$(CONFIG_WMAV2_DECODER)           += wmadec.o wma.o | ||||
|   | ||||
| @@ -232,6 +232,7 @@ void avcodec_register_all(void) | ||||
|     REGISTER_DECODER (VMDAUDIO, vmdaudio); | ||||
|     REGISTER_ENCDEC  (VORBIS, vorbis); | ||||
|     REGISTER_DECODER (WAVPACK, wavpack); | ||||
|     REGISTER_DECODER (WMAPRO, wmapro); | ||||
|     REGISTER_ENCDEC  (WMAV1, wmav1); | ||||
|     REGISTER_ENCDEC  (WMAV2, wmav2); | ||||
|     REGISTER_DECODER (WS_SND1, ws_snd1); | ||||
|   | ||||
| @@ -30,7 +30,7 @@ | ||||
| #include "libavutil/avutil.h" | ||||
|  | ||||
| #define LIBAVCODEC_VERSION_MAJOR 52 | ||||
| #define LIBAVCODEC_VERSION_MINOR 34 | ||||
| #define LIBAVCODEC_VERSION_MINOR 35 | ||||
| #define LIBAVCODEC_VERSION_MICRO  0 | ||||
|  | ||||
| #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ | ||||
|   | ||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
		Reference in New Issue
	
	Block a user