diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-11-09 18:13:33 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-11-09 18:13:33 +0100 |
| commit | abe2009f72e09173643b3d098ef17d3171a8f633 (patch) | |
| tree | 01fac5f7d5d1ab501e0c20061b6da4ffe4628365 /src/libffmpeg/ff_audio_decoder.c | |
| parent | 7626abc51a753ce512843e624d3bb4653ff514ce (diff) | |
| parent | c8f3cd1faf678b64920ad62f1275b03aae0157a7 (diff) | |
| download | xine-lib-abe2009f72e09173643b3d098ef17d3171a8f633.tar.gz xine-lib-abe2009f72e09173643b3d098ef17d3171a8f633.tar.bz2 | |
Merge FSF address changes from 1.1 branch.
--HG--
rename : src/combined/decoder_flac.c => src/combined/flac_decoder.c
rename : src/combined/demux_flac.c => src/combined/flac_demuxer.c
rename : src/libxineadec/nsf.c => src/combined/nsf_decoder.c
rename : src/demuxers/demux_nsf.c => src/combined/nsf_demuxer.c
rename : src/combined/combined_wavpack.c => src/combined/wavpack_combined.c
rename : src/combined/combined_wavpack.h => src/combined/wavpack_combined.h
rename : src/combined/decoder_wavpack.c => src/combined/wavpack_decoder.c
rename : src/combined/demux_wavpack.c => src/combined/wavpack_demuxer.c
rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
rename : src/libxineadec/xine_speex_decoder.c => src/combined/xine_speex_decoder.c
rename : src/libxinevdec/xine_theora_decoder.c => src/combined/xine_theora_decoder.c
rename : src/libxineadec/xine_vorbis_decoder.c => src/combined/xine_vorbis_decoder.c
rename : src/liba52/xine_a52_decoder.c => src/libxineadec/xine_a52_decoder.c
rename : src/libdts/xine_dts_decoder.c => src/libxineadec/xine_dts_decoder.c
rename : src/libfaad/xine_faad_decoder.c => src/libxineadec/xine_faad_decoder.c
rename : src/libmusepack/xine_musepack_decoder.c => src/libxineadec/xine_musepack_decoder.c
Diffstat (limited to 'src/libffmpeg/ff_audio_decoder.c')
| -rw-r--r-- | src/libffmpeg/ff_audio_decoder.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libffmpeg/ff_audio_decoder.c b/src/libffmpeg/ff_audio_decoder.c index 4a4141b2f..e125e6e39 100644 --- a/src/libffmpeg/ff_audio_decoder.c +++ b/src/libffmpeg/ff_audio_decoder.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * $Id: audio_decoder.c,v 1.33 2007/01/28 18:38:33 miguelfreitas Exp $ * |