Merge svn changes up to r31169

59 files changed, 311 insertions, 10208 deletions

diff --git a/Changelog b/Changelog
index acc58d6918..26255ce4c0 100644
--- a/Changelog
+++ b/Changelog
@@ -15,6 +15,7 @@ MPlayer (1.0)
     * Kega Game video codec (KGV1) via binary DLL
     * SoftLab-NSK Forward MPEG-2 I-frames (SLIF) via binary DLL
     * JPEG 2000 support via OpenJPEG
+    * internal liba52 copy removed
 
     Demuxers:
     * support for TrueHD in Blu-ray streams in libmpdemux
@@ -49,6 +50,7 @@ MPlayer (1.0)
     * better out-of-the-box support for compiling for ARM, IA64,
       MinGW32 and MinGW-w64, MinGW has ASLR enabled with recent
       enough binutils.
+    * libdvdcss synced with upstream Subversion snapshot
 
     MEncoder:
     * add -tsprog for demuxer lavf
diff --git a/Copyright b/Copyright
index 24261f58d2..a5ad159357 100644
--- a/Copyright
+++ b/Copyright
@@ -37,20 +37,8 @@ Copyright:  1992 by Jutta Degener and Carsten Bormann, TU Berlin
 License:    permissive, see libmpcodecs/native/xa_gsm.c
 
 
-Name:       liba52
-Version:    0.7.4 + patches
-URL:        http://liba52.sourceforge.net/
-Directory:  liba52
-Copyright:  1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
-            2000-2001 Michel Lespinasse <walken@zoy.org>
-            2000 Yuqing Deng <Yuqing_Deng@brown.edu>
-            2002 Nick Kurshev
-            2004 Romain Dolbeau <romain@dolbeau.org>
-License:    GNU General Public License
-
-
 Name:       libdvdcss
-Version:    1.2.10
+Version:    Subversion r225 + r229 + r231
 URL:        http://developers.videolan.org/libdvdcss/
 Directory:  libdvdcss
 Copyright:  1998-2008 VideoLAN
diff --git a/DOCS/tech/MAINTAINERS b/DOCS/tech/MAINTAINERS
index e2fcf01862..5c690a0c1e 100644
--- a/DOCS/tech/MAINTAINERS
+++ b/DOCS/tech/MAINTAINERS
@@ -91,7 +91,6 @@ Imported libs/projects:
     * VIDIX core: Benjamin Zores
     * mp3lib: None
     * loader: None
-    * liba52: None
     * libmpeg2: None
     * libdvdcss: Diego Biurrun
     * libdvdread: Diego Biurrun
diff --git a/DOCS/tech/binary-packaging.txt b/DOCS/tech/binary-packaging.txt
index 974a20d46f..6cc485ef2b 100644
--- a/DOCS/tech/binary-packaging.txt
+++ b/DOCS/tech/binary-packaging.txt
@@ -45,7 +45,7 @@ the following features MUST be included in any official binary package:
 * codecs
   - FAAD(internal)
   - libavcodec(internal)
-  - native codecs (libmpeg2/liba52/mp3lib)
+  - native codecs (libmpeg2/mp3lib)
   - Vorbis Tremor codec(internal)
   - RealPlayer codecs support (*)
   - Win32/VfW/DShow/QT codecs support (*)
diff --git a/DOCS/tech/general.txt b/DOCS/tech/general.txt
index b9ac61ff10..36a584b746 100644
--- a/DOCS/tech/general.txt
+++ b/DOCS/tech/general.txt
@@ -196,7 +196,7 @@ Now, go on:
            Only used if none of the above works.
 
 4. Codecs. Consists of libmpcodecs/* and separate files or libs,
-   for example liba52, libmpeg2, loader, mp3lib.
+   for example libmpeg2, loader, mp3lib.
 
    mplayer.c doesn't call them directly, but through the dec_audio.c and
    dec_video.c files, so the mplayer.c doesn't have to know anything about
diff --git a/DOCS/xml/Makefile b/DOCS/xml/Makefile
index c68c1b9570..01f935293d 100644
--- a/DOCS/xml/Makefile
+++ b/DOCS/xml/Makefile
@@ -30,23 +30,26 @@ html-single:  $(addprefix html-single-,$(DOC_LANGS))
 
 xmllint: $(addprefix xmllint-,$(DOC_LANGS))
 
-$(foreach lang,$(DOC_LANG_ALL),$(HTML)/$(lang)):
-	mkdir -p $@
-
 $(CONFIGURE_GENERATED) $(MAIN_XML_ALL):
-	sh configure
+	./configure
 
 define lang-def
-html-chunked-$(lang) html-single-$(lang): $(HTML)/$(lang) $(CONFIGURE_GENERATED)
+html-chunked-$(lang): $(HTML)/$(lang)/index.html
+html-single-$(lang):  $(HTML)/$(lang)/MPlayer.html
+$(HTML)/$(lang)/index.html $(HTML)/$(lang)/MPlayer.html: $(lang)/main.xml $(wildcard $(lang)/*.xml) html-common.xsl $(HTML)/$(lang)/default.css
+
+$(HTML)/$(lang)/default.css:
+	mkdir -p $$(@D)
+	cp -f default.css $$(@D)
 
-html-chunked-$(lang):
-	$(MAKE) HTMLDIR=../$$< -C $(lang) html-chunked
+$(HTML)/$(lang)/index.html:
+	./xsltproc.sh $$(@D)/ html-chunk.xsl $$<
 
-html-single-$(lang):
-	$(MAKE) HTMLDIR=../$$< -C $(lang) html-single
+$(HTML)/$(lang)/MPlayer.html:
+	./xsltproc.sh $$@ html-single.xsl $$<
 
-xmllint-$(lang): xmllint.sh
-	$(MAKE) -C $(lang) xmllint
+xmllint-$(lang): $(lang)/main.xml
+	./xmllint.sh $$<
 endef
 
 $(foreach lang, $(DOC_LANG_ALL),$(eval $(lang-def)))
@@ -61,4 +64,4 @@ releaseclean:
 distclean: clean releaseclean
 
 .PHONY: all help html-chunked html-single xmllint
-.PHONY: html-chunked-* html-single-* xmllint-* *clean*
+.PHONY: html-chunked-* html-single-* xmllint-* *clean
diff --git a/DOCS/xml/Makefile.inc b/DOCS/xml/Makefile.inc
deleted file mode 100644
index 44e022d56c..0000000000
--- a/DOCS/xml/Makefile.inc
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Makefile.inc for Makefiles in subdirectories.
-#
-
-HTML_CHUNK_XSL := ../html-chunk.xsl
-CHUNK_XSL_DEPS := $(HTML_CHUNK_XSL) ../html-common.xsl
-
-HTML_SINGLE_XSL := ../html-single.xsl
-SINGLE_XSL_DEPS := $(HTML_SINGLE_XSL) ../html-common.xsl
-
-# This is the main target...
-all: html-chunked html-single
-html-chunked: $(HTMLDIR)/index.html
-html-single:  $(HTMLDIR)/MPlayer.html
-
-xmllint: main.xml
-	../xmllint.sh $<
-
-$(HTMLDIR)/default.css:
-	cp -f ../default.css $(@D)
-
-$(HTMLDIR)/index.html: main.xml $(CHUNK_XSL_DEPS) xmllint $(HTMLDIR)/default.css
-	../xsltproc.sh $(HTMLDIR)/ $(HTML_CHUNK_XSL) $<
-
-$(HTMLDIR)/MPlayer.html: main.xml $(SINGLE_XSL_DEPS) xmllint $(HTMLDIR)/default.css
-	../xsltproc.sh $@ $(HTML_SINGLE_XSL) $<
-
-../html-chunk.xsl ../html-single.xsl main.xml:
-	cd .. && sh configure
-
-.PHONY: all html-chunked html-single xmllint
diff --git a/DOCS/xml/README b/DOCS/xml/README
index 1897dd53eb..f05432aaa2 100644
--- a/DOCS/xml/README
+++ b/DOCS/xml/README
@@ -73,6 +73,28 @@ to see all available build targets and make your choice. If something goes
 wrong, check the Configuration section of the toplevel Makefile and adjust
 the variables.
 
+The documentation and its translations reside in subdirectories.
+When building the documentation, the generated HTML files are
+placed in subdirectories of the 'HTML' directory.
+
+IMPORTANT: Do NOT place sensitive files under 'HTML'!
+           It is for generated documentation only.
+           The whole directory tree is wiped out by the Makefile
+           when running 'make distclean' or 'make clean'.
+
+
+Adding new translations
+~~~~~~~~~~~~~~~~~~~~~~~
+
+1) Create a new subdirectory and copy the XML files there. main.xml must not be
+   copied, it is autogenerated.
+
+2) In each translated file after the <?xml ... ?> tag you must put a note
+   like <!-- synced with r2 -->, where 2 is the revision of corresponding
+   English file (see comment at the top of file).
+
+That's all, in theory.
+
 
 A few words about SGML catalog files
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/DOCS/xml/README.maintainers b/DOCS/xml/README.maintainers
deleted file mode 100644
index 056a2ae039..0000000000
--- a/DOCS/xml/README.maintainers
+++ /dev/null
@@ -1,31 +0,0 @@
-The documentation and its translations reside in subdirectories.
-When building the documentation, the toplevel Makefile goes into
-the subdirectories listed in the SUBDIRS variable and executes make
-in each of those directories to create the HTML documentation
-in subdirectories of the 'HTML' directory.
-
-IMPORTANT: Do NOT place sensitive files under 'HTML'!
-           It is for generated documentation only.
-           The whole directory tree is wiped out by the Makefile
-           when running 'make distclean' or 'make clean'.
-
-Each subdirectory must have a Makefile.  Its purpose is to include
-the toplevel Makefile.inc file (with the rules to build the docs)
-and add dependency information to the main target, $(HTMLDIR)/index.html.
-The main target usually depends on all the XML files in the subdirectory.
-
-
-Adding new translations
-~~~~~~~~~~~~~~~~~~~~~~~
-
-1) Create a new subdirectory and copy the XML files there. main.xml must not be
-   copied, it is autogenerated.
-
-2) Make sure to create a 'Makefile' for the translation -- you can
-   use 'en/Makefile' as an example.
-
-3) In each translated file after the <?xml ... ?> tag you must put a note
-   like <!-- synced with r2 -->, where 2 is the revision of corresponding
-   English file (see comment at the top of file).
-
-That's all, in theory.
diff --git a/DOCS/xml/cs/Makefile b/DOCS/xml/cs/Makefile
deleted file mode 100644
index db38611f41..0000000000
--- a/DOCS/xml/cs/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dependency information.
-$(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml)
-
-include ../Makefile.inc
diff --git a/DOCS/xml/de/Makefile b/DOCS/xml/de/Makefile
deleted file mode 100644
index db38611f41..0000000000
--- a/DOCS/xml/de/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dependency information.
-$(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml)
-
-include ../Makefile.inc
diff --git a/DOCS/xml/en/Makefile b/DOCS/xml/en/Makefile
deleted file mode 100644
index db38611f41..0000000000
--- a/DOCS/xml/en/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dependency information.
-$(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml)
-
-include ../Makefile.inc
diff --git a/DOCS/xml/es/Makefile b/DOCS/xml/es/Makefile
deleted file mode 100644
index db38611f41..0000000000
--- a/DOCS/xml/es/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dependency information.
-$(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml)
-
-include ../Makefile.inc
diff --git a/DOCS/xml/fr/Makefile b/DOCS/xml/fr/Makefile
deleted file mode 100644
index db38611f41..0000000000
--- a/DOCS/xml/fr/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dependency information.
-$(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml)
-
-include ../Makefile.inc
diff --git a/DOCS/xml/hu/Makefile b/DOCS/xml/hu/Makefile
deleted file mode 100644
index db38611f41..0000000000
--- a/DOCS/xml/hu/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dependency information.
-$(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml)
-
-include ../Makefile.inc
diff --git a/DOCS/xml/it/Makefile b/DOCS/xml/it/Makefile
deleted file mode 100644
index db38611f41..0000000000
--- a/DOCS/xml/it/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dependency information.
-$(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml)
-
-include ../Makefile.inc
diff --git a/DOCS/xml/pl/Makefile b/DOCS/xml/pl/Makefile
deleted file mode 100644
index db38611f41..0000000000
--- a/DOCS/xml/pl/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dependency information.
-$(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml)
-
-include ../Makefile.inc
diff --git a/DOCS/xml/ru/Makefile b/DOCS/xml/ru/Makefile
deleted file mode 100644
index db38611f41..0000000000
--- a/DOCS/xml/ru/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dependency information.
-$(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml)
-
-include ../Makefile.inc
diff --git a/DOCS/xml/zh_CN/Makefile b/DOCS/xml/zh_CN/Makefile
deleted file mode 100644
index db38611f41..0000000000
--- a/DOCS/xml/zh_CN/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dependency information.
-$(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml)
-
-include ../Makefile.inc
diff --git a/Makefile b/Makefile
index cb45df4f1c..4031e47047 100644
--- a/Makefile
+++ b/Makefile
@@ -108,16 +108,6 @@ SRCS_COMMON-$(HAVE_SYS_MMAN_H)       += libaf/af_export.c osdep/mmap_anon.c
 SRCS_COMMON-$(JPEG)                  += libmpcodecs/vd_ijpg.c
 SRCS_COMMON-$(LADSPA)                += libaf/af_ladspa.c
 SRCS_COMMON-$(LIBA52)                += libmpcodecs/ad_liba52.c
-SRCS_LIBA52_INTERNAL                 += liba52/crc.c \
-                                        liba52/resample.c \
-                                        liba52/bit_allocate.c \
-                                        liba52/bitstream.c \
-                                        liba52/downmix.c \
-                                        liba52/imdct.c \
-                                        liba52/parse.c \
-
-SRCS_COMMON-$(LIBA52_INTERNAL)       += $(SRCS_LIBA52_INTERNAL)
-
 SRCS_COMMON-$(LIBASS)                += ass_mp.c \
                                         libmpcodecs/vf_ass.c \
 
@@ -705,7 +695,6 @@ INSTALL_TARGETS-$(MPLAYER)  += install-mplayer \
 
 DIRS =  . \
         input \
-        liba52 \
         libaf \
         libao2 \
         libass \
@@ -942,8 +931,6 @@ codec-cfg-test$(EXESUF): codec-cfg.c codecs.conf.h $(TEST_OBJS)
 codecs2html$(EXESUF): codec-cfg.c $(TEST_OBJS)
 	$(CC) -I. -DCODECS2HTML -o $@ $^
 
-liba52/test$(EXESUF): cpudetect.o $(SRCS_LIBA52_INTERNAL:.c=.o) -lm
-
 libvo/aspecttest$(EXESUF): libvo/aspect.o libvo/geometry.o $(TEST_OBJS)
 
 LOADER_TEST_OBJS = $(SRCS_WIN32_EMULATION:.c=.o) $(SRCS_QTX_EMULATION:.S=.o) libavutil/libavutil.a osdep/mmap_anon.o cpudetect.o $(TEST_OBJS)
@@ -953,8 +940,7 @@ loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): $(LOADER_TEST_OBJS)
 
 mp3lib/test$(EXESUF) mp3lib/test2$(EXESUF): $(SRCS_MP3LIB:.c=.o) libvo/aclib.o cpudetect.o $(TEST_OBJS)
 
-TESTS = codecs2html codec-cfg-test liba52/test libvo/aspecttest \
-        mp3lib/test mp3lib/test2
+TESTS = codecs2html codec-cfg-test libvo/aspecttest mp3lib/test mp3lib/test2
 
 ifdef ARCH_X86
 TESTS += loader/qtx/list loader/qtx/qtxload
diff --git a/configure b/configure
index b179caa9aa..6fb6c9e765 100755
--- a/configure
+++ b/configure
@@ -320,7 +320,6 @@ Codecs:
   --enable-libdca           enable libdca support [autodetect]
   --disable-mp3lib          disable builtin mp3lib [autodetect]
   --disable-liba52          disable liba52 [autodetect]
-  --enable-liba52-internal  enable builtin liba52 [disabled]
   --disable-libmpeg2        disable builtin libmpeg2 [autodetect]
   --disable-musepack        disable musepack support [autodetect]
 
@@ -580,7 +579,6 @@ _speex=auto
 _theora=auto
 _mp3lib=auto
 _liba52=auto
-_liba52_internal=no
 _libdca=auto
 _libmpeg2=auto
 _faad=auto
@@ -969,8 +967,6 @@ for ac_option do
   --disable-theora)     _theora=no      ;;
   --enable-mp3lib)      _mp3lib=yes     ;;
   --disable-mp3lib)     _mp3lib=no      ;;
-  --enable-liba52-internal)     _liba52_internal=yes    ;;
-  --disable-liba52-internal)    _liba52_internal=no     ;;
   --enable-liba52)      _liba52=yes     ;;
   --disable-liba52)     _liba52=no      ;;
   --enable-libdca)      _libdca=yes     ;;
@@ -6504,27 +6500,19 @@ fi
 echores "$_mp3lib"
 
 echocheck "liba52 support"
-if test "$_liba52_internal" = auto ; then
-  test "$cc_vendor" = intel && test "$_cc_major" -le 10 -o "$_cc_major" -eq 11 -a "$_cc_minor" -eq 0 && _liba52_internal=no || _liba52_internal=yes
-fi
 def_liba52='#undef CONFIG_LIBA52'
-def_liba52_internal="#undef CONFIG_LIBA52_INTERNAL"
-if test "$_liba52_internal" = yes ; then
-  _liba52=yes
-  def_liba52_internal="#define CONFIG_LIBA52_INTERNAL 1"
-  res_comment="internal"
-elif test "$_liba52_internal" = no && test "$_liba52" = auto ; then
+if test "$_liba52" = auto ; then
   _liba52=no
   cat > $TMPC << EOF
 #include <inttypes.h>
 #include <a52dec/a52.h>
 int main(void) { a52_state_t *testHand; testHand=a52_init(0); return 0; }
 EOF
-  cc_check -la52 && _liba52=yes && res_comment="external" && extra_ldflags="$extra_ldflags -la52"
+  cc_check -la52 && _liba52=yes && extra_ldflags="$extra_ldflags -la52"
 fi
 if test "$_liba52" = yes ; then
   def_liba52='#define CONFIG_LIBA52 1'
-  codecmodules="liba52($res_comment) $codecmodules"
+  codecmodules="liba52 $codecmodules"
 else
   nocodecmodules="liba52 $nocodecmodules"
 fi
@@ -7952,7 +7940,6 @@ KAI = $_kai
 KVA = $_kva
 LADSPA = $_ladspa
 LIBA52 = $_liba52
-LIBA52_INTERNAL = $_liba52_internal
 LIBASS = $_ass
 LIBBS2B = $_libbs2b
 LIBDCA = $_libdca
@@ -8284,7 +8271,6 @@ $def_faac
 $def_faad
 $def_faad_internal
 $def_liba52
-$def_liba52_internal
 $def_libdca
 $def_libdv
 $def_liblzo
diff --git a/etc/codecs.conf b/etc/codecs.conf
index a941116227..a2d384bd15 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -2130,7 +2130,8 @@ videocodec ffvp6a
 videocodec ffvp6f
   info "FFmpeg VP6 Flash"
   status working
-  fourcc VP6F,FLV4
+  fourcc VP6F
+  fourcc FLV4
   driver ffmpeg
   dll "vp6f"
   out YV12
diff --git a/liba52/a52.h b/liba52/a52.h
deleted file mode 100644
index 3547ad1d36..0000000000
--- a/liba52/a52.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * a52.h
- * Copyright (C) 2000-2002 Michel Lespinasse <walken@zoy.org>
- * Copyright (C) 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
- *
- * This file is part of a52dec, a free ATSC A-52 stream decoder.
- * See http://liba52.sourceforge.net/ for updates.
- *
- * Modified for use with MPlayer, changes contained in liba52_changes.diff.
- * detailed changelog at http://svn.mplayerhq.hu/mplayer/trunk/
- * $Id$
- *
- * a52dec is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * a52dec is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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
- */
-
-#ifndef A52_H
-#define A52_H
-
-#include <stdint.h>
-#include "mm_accel.h"
-
-#ifndef LIBA52_DOUBLE
-typedef float sample_t;
-#else
-typedef double sample_t;
-#endif
-
-typedef struct a52_state_s a52_state_t;
-
-#define A52_CHANNEL 0
-#define A52_MONO 1
-#define A52_STEREO 2
-#define A52_3F 3
-#define A52_2F1R 4
-#define A52_3F1R 5
-#define A52_2F2R 6
-#define A52_3F2R 7
-#define A52_CHANNEL1 8
-#define A52_CHANNEL2 9
-#define A52_DOLBY 10
-#define A52_CHANNEL_MASK 15
-
-#define A52_LFE 16
-#define A52_ADJUST_LEVEL 32
-
-a52_state_t * a52_init (uint32_t mm_accel);
-sample_t * a52_samples (a52_state_t * state);
-int a52_syncinfo (uint8_t * buf, int * flags,
-		  int * sample_rate, int * bit_rate);
-int a52_frame (a52_state_t * state, uint8_t * buf, int * flags,
-	       sample_t * level, sample_t bias);
-void a52_dynrng (a52_state_t * state,
-		 sample_t (* call) (sample_t, void *), void * data);
-int a52_block (a52_state_t * state);
-void a52_free (a52_state_t * state);
-
-void* a52_resample_init(uint32_t mm_accel,int flags,int chans);
-extern int (* a52_resample) (float * _f, int16_t * s16);
-
-uint16_t crc16_block(uint8_t *data,uint32_t num_bytes);
-
-#endif /* A52_H */
diff --git a/liba52/a52_internal.h b/liba52/a52_internal.h
deleted file mode 100644
index 1f6d205931..0000000000
--- a/liba52/a52_internal.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * a52_internal.h
- * Copyright (C) 2000-2002 Michel Lespinasse <walken@zoy.org>
- * Copyright (C) 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
- *
- * This file is part of a52dec, a free ATSC A-52 stream decoder.
- * See http://liba52.sourceforge.net/ for updates.
- *
- * Modified for use with MPlayer, changes contained in liba52_changes.diff.
- * detailed changelog at http://svn.mplayerhq.hu/mplayer/trunk/
- * $Id$
- *
- * a52dec is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * a52dec is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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
- */
-
-typedef struct {