diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-07-17 16:50:59 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-07-17 16:50:59 +0100 |
| commit | 35b16971490c92f53cb5264e68ba67fb7352629a (patch) | |
| tree | 5a17a0bc2f6abfae1d802e094c07b5b72aaa6d00 /src/combined | |
| parent | b70e34352e304cf03da32b688d84eec3c3ffacec (diff) | |
| parent | f1382ea01b368dc1d8044b368f602aad87f6468e (diff) | |
| download | xine-lib-35b16971490c92f53cb5264e68ba67fb7352629a.tar.gz xine-lib-35b16971490c92f53cb5264e68ba67fb7352629a.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/xine-engine/buffer.h => include/xine/buffer.h
rename : src/demuxers/demux_nsf.c => src/combined/nsf_demuxer.c
rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
rename : src/libspucmml/xine_cmml_decoder.c => src/spu_dec/cmml_decoder.c
rename : src/libspudec/xine_spu_decoder.c => src/spu_dec/spu_decoder.c
rename : src/libspudvb/xine_spudvb_decoder.c => src/spu_dec/spudvb_decoder.c
rename : src/libsputext/xine_sputext_decoder.c => src/spu_dec/sputext_decoder.c
rename : src/libsputext/demux_sputext.c => src/spu_dec/sputext_demuxer.c
Diffstat (limited to 'src/combined')
| -rw-r--r-- | src/combined/ffmpeg/ff_audio_decoder.c | 5 | ||||
| -rw-r--r-- | src/combined/ffmpeg/ff_video_decoder.c | 2 | ||||
| -rw-r--r-- | src/combined/nsf_demuxer.c | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/combined/ffmpeg/ff_audio_decoder.c b/src/combined/ffmpeg/ff_audio_decoder.c index 4074ff776..8559c6ece 100644 --- a/src/combined/ffmpeg/ff_audio_decoder.c +++ b/src/combined/ffmpeg/ff_audio_decoder.c @@ -107,6 +107,8 @@ static const ff_codec_t ff_audio_lookup[] = { {BUF_AUDIO_SMACKER, CODEC_ID_SMACKAUDIO, "Smacker (ffmpeg)"}, {BUF_AUDIO_FLVADPCM, CODEC_ID_ADPCM_SWF, "Flash ADPCM (ffmpeg)"}, {BUF_AUDIO_WAVPACK, CODEC_ID_WAVPACK, "WavPack (ffmpeg)"}, + {BUF_AUDIO_AMR_NB, CODEC_ID_AMR_NB, "AMR narrow band (ffmpeg)"}, + {BUF_AUDIO_AMR_WB, CODEC_ID_AMR_WB, "AMR wide band (ffmpeg)"}, }; @@ -519,7 +521,8 @@ static const uint32_t supported_audio_types[] = { BUF_AUDIO_SMACKER, BUF_AUDIO_FLVADPCM, BUF_AUDIO_WAVPACK, - + BUF_AUDIO_AMR_NB, + BUF_AUDIO_AMR_WB, 0 }; diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c index 02fcdce40..8afbde890 100644 --- a/src/combined/ffmpeg/ff_video_decoder.c +++ b/src/combined/ffmpeg/ff_video_decoder.c @@ -320,6 +320,7 @@ static const ff_codec_t ff_video_lookup[] = { {BUF_VIDEO_CAVS, CODEC_ID_CAVS, "Chinese AVS (ffmpeg)"}, {BUF_VIDEO_VMNC, CODEC_ID_VMNC, "VMware Screen Codec (ffmpeg)"}, {BUF_VIDEO_THEORA_RAW, CODEC_ID_THEORA, "Theora (ffmpeg)"}, + {BUF_VIDEO_SNOW, CODEC_ID_SNOW, "Snow (ffmpeg)"}, }; static const char *const skip_loop_filter_enum_names[] = { @@ -1731,6 +1732,7 @@ static const uint32_t supported_video_types[] = { BUF_VIDEO_FLASHSV, BUF_VIDEO_CAVS, BUF_VIDEO_VMNC, + BUF_VIDEO_SNOW, BUF_VIDEO_THEORA_RAW, 0 }; diff --git a/src/combined/nsf_demuxer.c b/src/combined/nsf_demuxer.c index ee05f0f90..8ee816c99 100644 --- a/src/combined/nsf_demuxer.c +++ b/src/combined/nsf_demuxer.c @@ -98,7 +98,7 @@ static int open_nsf_file(demux_nsf_t *this) { return 0; /* check for the signature */ - if ( memcmp(header, "NESM\x1A", 5) != 0 ) + if (memcmp(header, "NESM\x1A", 5) != 0) return 0; this->total_songs = header[6]; |