mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Vorbis decoder by (Balatoni Denes | dbalatoni programozo hu)
Originally committed as revision 4261 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
5773a74669
commit
0bde73d907
@ -151,6 +151,9 @@ endif
|
|||||||
ifneq ($(CONFIG_VMDVIDEO_DECODER)$(CONFIG_VMDAUDIO_DECODER),)
|
ifneq ($(CONFIG_VMDVIDEO_DECODER)$(CONFIG_VMDAUDIO_DECODER),)
|
||||||
OBJS+= vmdav.o
|
OBJS+= vmdav.o
|
||||||
endif
|
endif
|
||||||
|
ifeq ($(CONFIG_VORBIS_DECODER),yes)
|
||||||
|
OBJS+= vorbis.o
|
||||||
|
endif
|
||||||
ifneq ($(CONFIG_VP3_DECODER)$(CONFIG_THEORA_DECODER),)
|
ifneq ($(CONFIG_VP3_DECODER)$(CONFIG_THEORA_DECODER),)
|
||||||
OBJS+= vp3.o
|
OBJS+= vp3.o
|
||||||
endif
|
endif
|
||||||
|
@ -55,7 +55,7 @@ void avcodec_register_all(void)
|
|||||||
#ifdef CONFIG_OGGVORBIS_ENCODER
|
#ifdef CONFIG_OGGVORBIS_ENCODER
|
||||||
register_avcodec(&oggvorbis_encoder);
|
register_avcodec(&oggvorbis_encoder);
|
||||||
#endif //CONFIG_OGGVORBIS_ENCODER
|
#endif //CONFIG_OGGVORBIS_ENCODER
|
||||||
#ifdef CONFIG_OGGVORBIS_DECODER
|
#if (defined CONFIG_OGGVORBIS_DECODER && !defined CONFIG_VORBIS_DECODER)
|
||||||
register_avcodec(&oggvorbis_decoder);
|
register_avcodec(&oggvorbis_decoder);
|
||||||
#endif //CONFIG_OGGVORBIS_DECODER
|
#endif //CONFIG_OGGVORBIS_DECODER
|
||||||
#endif
|
#endif
|
||||||
@ -476,6 +476,9 @@ void avcodec_register_all(void)
|
|||||||
#ifdef CONFIG_WS_SND1_DECODER
|
#ifdef CONFIG_WS_SND1_DECODER
|
||||||
register_avcodec(&ws_snd1_decoder);
|
register_avcodec(&ws_snd1_decoder);
|
||||||
#endif //CONFIG_WS_SND1_DECODER
|
#endif //CONFIG_WS_SND1_DECODER
|
||||||
|
#ifdef CONFIG_VORBIS_DECODER
|
||||||
|
register_avcodec(&vorbis_decoder);
|
||||||
|
#endif
|
||||||
#endif /* CONFIG_DECODERS */
|
#endif /* CONFIG_DECODERS */
|
||||||
|
|
||||||
#ifdef AMR_NB
|
#ifdef AMR_NB
|
||||||
|
@ -2018,6 +2018,7 @@ extern AVCodec aasc_decoder;
|
|||||||
extern AVCodec alac_decoder;
|
extern AVCodec alac_decoder;
|
||||||
extern AVCodec ws_snd1_decoder;
|
extern AVCodec ws_snd1_decoder;
|
||||||
extern AVCodec indeo2_decoder;
|
extern AVCodec indeo2_decoder;
|
||||||
|
extern AVCodec vorbis_decoder;
|
||||||
|
|
||||||
/* pcm codecs */
|
/* pcm codecs */
|
||||||
#define PCM_CODEC(id, name) \
|
#define PCM_CODEC(id, name) \
|
||||||
|
1414
libavcodec/vorbis.c
Normal file
1414
libavcodec/vorbis.c
Normal file
File diff suppressed because it is too large
Load Diff
2225
libavcodec/vorbis.h
Normal file
2225
libavcodec/vorbis.h
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user