* configure.ac.in, modules/codec/ffmpeg/*, modules/encoder/ffmpeg/*, modules/stream_o...

[vlc] / modules / codec / ffmpeg / audio.h

diff --git a/modules/codec/ffmpeg/audio.h b/modules/codec/ffmpeg/audio.h
index 8c13a194a27891fdb9f7414af5d6b5ed33452761..59258e0e0a89d12f4fd15d55ca5d91b3f6982fda 100644 (file)
--- a/modules/codec/ffmpeg/audio.h
+++ b/modules/codec/ffmpeg/audio.h
@@ -2,7 +2,7 @@
  * audio.h: video decoder using ffmpeg library
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: audio.h,v 1.3 2003/01/25 16:59:49 fenrir Exp $
+ * $Id: audio.h,v 1.4 2003/02/07 01:22:55 fenrir Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -10,7 +10,7 @@
  * 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.
- * 
+ *
  * This program 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
@@ -22,20 +22,6 @@
  *****************************************************************************/
 
 
-/* for an audio stream */
-typedef struct waveformatex_s
-{
-    u16 i_formattag;
-    u16 i_nb_channels;
-    u32 i_samplespersec;
-    u32 i_avgbytespersec;
-    u16 i_blockalign;
-    u16 i_bitspersample;
-    u16 i_size; /* the extra size in bytes */
-
-    u8  *p_data; /* The extra data */
-} waveformatex_t;
-
 typedef struct adec_thread_s
 {
     DECODER_THREAD_COMMON