diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-09 20:40:24 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-09 20:40:24 +0200 |
| commit | 1836b8ffe31f393d256c8021aaf7a2308561a0c2 (patch) | |
| tree | 6a80efd3b4ed8a29d55a7b331a43ac7bd5ed4855 /src/libffmpeg/ff_dvaudio_decoder.c | |
| parent | a89f36b0b3e9008cd7f8378e4fa40a3c37d7a23e (diff) | |
| parent | 199dc87abe65001f7ef9ec56bca7c3d80af39bcf (diff) | |
| download | xine-lib-1836b8ffe31f393d256c8021aaf7a2308561a0c2.tar.gz xine-lib-1836b8ffe31f393d256c8021aaf7a2308561a0c2.tar.bz2 | |
Merge the FFmpeg integration branch into the nopadding branch.
Diffstat (limited to 'src/libffmpeg/ff_dvaudio_decoder.c')
| -rw-r--r-- | src/libffmpeg/ff_dvaudio_decoder.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/libffmpeg/ff_dvaudio_decoder.c b/src/libffmpeg/ff_dvaudio_decoder.c index 2c851bae1..985165611 100644 --- a/src/libffmpeg/ff_dvaudio_decoder.c +++ b/src/libffmpeg/ff_dvaudio_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: dvaudio_decoder.c,v 1.12 2006/12/04 22:25:13 miguelfreitas Exp $ + * $Id: dvaudio_decoder.c,v 1.11 2006/07/10 22:08:29 dgp85 Exp $ * * dv audio decoder based on patch by Dan Dennedy <dan@dennedy.org> * @@ -55,13 +55,8 @@ # undef uint64_t #endif -#ifdef HAVE_FFMPEG -# include <avcodec.h> -# include "libavcodec/dvdata.h" -#else -# include "libavcodec/avcodec.h" -# include "libavcodec/dvdata.h" -#endif +#include <avcodec.h> +#include <dvdata.h> /* This is not installed by FFmpeg, its usage has to be cleared up */ #ifdef _MSC_VER # undef malloc @@ -96,7 +91,6 @@ typedef struct dvaudio_decoder_s { } dvaudio_decoder_t; - /* * This is the dumbest implementation of all -- it simply looks at * a fixed offset and if pack isn't there -- fails. We might want |