diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-03-24 21:02:08 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-03-24 21:02:08 +0000 |
| commit | 1e26328be7611a7acdd5f9ecbcac32cba5cfab57 (patch) | |
| tree | 74fb64a947e066d05874954404414997f5ae7641 /src/combined | |
| parent | bf90f534f29892ded8f92f088bd9c78486d5833e (diff) | |
| parent | 74853b910cfd296eb0fea43394a3819e803c46b9 (diff) | |
| download | xine-lib-1e26328be7611a7acdd5f9ecbcac32cba5cfab57.tar.gz xine-lib-1e26328be7611a7acdd5f9ecbcac32cba5cfab57.tar.bz2 | |
Merge from 1.1.
--HG--
rename : doc/hackersguide/internals.sgml => doc/hackersguide/internals.docbook
rename : doc/hackersguide/library.sgml => doc/hackersguide/library.docbook
rename : include/xine.h.in => include/xine.h
rename : src/xine-engine/buffer.h => include/xine/buffer.h
rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
Diffstat (limited to 'src/combined')
| -rw-r--r-- | src/combined/ffmpeg/ff_audio_decoder.c | 1 | ||||
| -rw-r--r-- | src/combined/ffmpeg/xine_audio.list | 1 | ||||
| -rw-r--r-- | src/combined/xine_ogg_demuxer.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/src/combined/ffmpeg/ff_audio_decoder.c b/src/combined/ffmpeg/ff_audio_decoder.c index b6b5a2075..534a97afb 100644 --- a/src/combined/ffmpeg/ff_audio_decoder.c +++ b/src/combined/ffmpeg/ff_audio_decoder.c @@ -284,6 +284,7 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) if (!this->output_open) { if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels) { + decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE; avcodec_decode_audio2 (this->context, (int16_t *)this->decode_buffer, &decode_buffer_size, diff --git a/src/combined/ffmpeg/xine_audio.list b/src/combined/ffmpeg/xine_audio.list index b4a7455ea..796917dfe 100644 --- a/src/combined/ffmpeg/xine_audio.list +++ b/src/combined/ffmpeg/xine_audio.list @@ -40,6 +40,7 @@ FLVADPCM ADPCM_SWF Flash ADPCM WAVPACK WAVPACK WavPack AMR_NB AMR_NB AMR narrow band AMR_WB AMR_WB AMR wide band +EAC3 EAC3 E-AC-3 # disabled codecs (ref. configure.ac) ! AAC diff --git a/src/combined/xine_ogg_demuxer.c b/src/combined/xine_ogg_demuxer.c index 6aa89c142..fa6fd10eb 100644 --- a/src/combined/xine_ogg_demuxer.c +++ b/src/combined/xine_ogg_demuxer.c @@ -429,6 +429,7 @@ static const struct ogg_meta { OGG_META (ARTIST, 0), OGG_META (PUBLISHER, 0), OGG_META (COPYRIGHT, 0), + OGG_META (DISCNUMBER, 0), OGG_META (LICENSE, 0), OGG_META (TITLE, 0), OGG_META_L (TRACKNUMBER, 0, TRACK_NUMBER), |