summaryrefslogtreecommitdiff
path: root/src/demuxers
diff options
context:
space:
mode:
Diffstat (limited to 'src/demuxers')
-rw-r--r--src/demuxers/demux_asf.c4
-rw-r--r--src/demuxers/demux_avi.c4
-rw-r--r--src/demuxers/demux_film.c20
-rw-r--r--src/demuxers/demux_ogg.c15
-rw-r--r--src/demuxers/demux_qt.c19
5 files changed, 13 insertions, 49 deletions
diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c
index 15691bda8..ca28d2037 100644
--- a/src/demuxers/demux_asf.c
+++ b/src/demuxers/demux_asf.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: demux_asf.c,v 1.40 2002/05/25 19:19:16 siggi Exp $
+ * $Id: demux_asf.c,v 1.41 2002/06/03 13:31:13 miguelfreitas Exp $
*
* demultiplexer for asf streams
*
@@ -380,7 +380,7 @@ static unsigned long str2ulong(unsigned char *str) {
static void asf_send_video_header (demux_asf_t *this, int stream_id) {
buf_element_t *buf;
- BITMAPINFOHEADER *bih = (BITMAPINFOHEADER *) this->bih;
+ xine_bmiheader *bih = (xine_bmiheader *) this->bih;
this->streams[this->num_streams].buf_type =
fourcc_to_buf_video((void*)&bih->biCompression);
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c
index e168427cf..a217e84f2 100644
--- a/src/demuxers/demux_avi.c
+++ b/src/demuxers/demux_avi.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: demux_avi.c,v 1.90 2002/05/25 19:19:16 siggi Exp $
+ * $Id: demux_avi.c,v 1.91 2002/06/03 13:31:13 miguelfreitas Exp $
*
* demultiplexer for avi streams
*
@@ -160,7 +160,7 @@ typedef struct
long max_idx; /* number of index entries actually allocated */
unsigned char (*idx)[16]; /* index entries (AVI idx1 tag) */
video_index_t video_idx;
- BITMAPINFOHEADER bih;
+ xine_bmiheader bih;
off_t movi_start;
} avi_t;
diff --git a/src/demuxers/demux_film.c b/src/demuxers/demux_film.c
index 46289f993..f025607af 100644
--- a/src/demuxers/demux_film.c
+++ b/src/demuxers/demux_film.c
@@ -21,7 +21,7 @@
* For more information on the FILM file format, visit:
* http://www.pcisys.net/~melanson/codecs/
*
- * $Id: demux_film.c,v 1.6 2002/05/28 17:50:15 miguelfreitas Exp $
+ * $Id: demux_film.c,v 1.7 2002/06/03 13:31:13 miguelfreitas Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -55,22 +55,6 @@
#define VALID_ENDS "cpk,cak,film"
-/* TODO: lobby the xine team to revise the API so that it's no longer
- necessary to ship around this inane Win32-specific structure */
-typedef struct {
- long biSize;
- long biWidth;
- long biHeight;
- short biPlanes;
- short biBitCount;
- long biCompression;
- long biSizeImage;
- long biXPelsPerMeter;
- long biYPelsPerMeter;
- long biClrUsed;
- long biClrImportant;
-} BITMAPINFOHEADER;
-
typedef struct {
off_t sample_offset;
unsigned int sample_size;
@@ -105,7 +89,7 @@ typedef struct {
/* video information */
unsigned int video_codec;
unsigned int video_type;
- BITMAPINFOHEADER bih;
+ xine_bmiheader bih;
/* audio information */
unsigned int audio_type;
diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c
index 8a9d66852..0d58126a3 100644
--- a/src/demuxers/demux_ogg.c
+++ b/src/demuxers/demux_ogg.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: demux_ogg.c,v 1.26 2002/05/25 19:19:17 siggi Exp $
+ * $Id: demux_ogg.c,v 1.27 2002/06/03 13:31:13 miguelfreitas Exp $
*
* demultiplexer for ogg streams
*
@@ -36,11 +36,6 @@
#include <ogg/ogg.h>
-#define WINE_TYPEDEFS_ONLY
-#include "libw32dll/wine/avifmt.h"
-#include "libw32dll/wine/windef.h"
-#include "libw32dll/wine/vfw.h"
-
#include "xine_internal.h"
#include "xineutils.h"
#include "demux.h"
@@ -228,7 +223,7 @@ static void demux_ogg_send_package (demux_ogg_t *this) {
dsogg_header_t *oggh;
buf_element_t *buf;
- BITMAPINFOHEADER bih;
+ xine_bmiheader bih;
#ifdef LOG
printf ("demux_ogg: direct show filter created stream detected, hexdump:\n");
@@ -251,7 +246,7 @@ static void demux_ogg_send_package (demux_ogg_t *this) {
printf ("demux_ogg: buf_type %08x\n",this->buf_types[stream_num]);
#endif
- bih.biSize=sizeof(BITMAPINFOHEADER);
+ bih.biSize=sizeof(xine_bmiheader);
bih.biWidth = oggh->hubba.video.width;
bih.biHeight= oggh->hubba.video.height;
bih.biPlanes= 0;
@@ -268,8 +263,8 @@ static void demux_ogg_send_package (demux_ogg_t *this) {
buf->decoder_flags = BUF_FLAG_HEADER;
this->frame_duration = oggh->time_unit * 9 / 1000;
buf->decoder_info[1] = this->frame_duration;
- memcpy (buf->content, &bih, sizeof (BITMAPINFOHEADER));
- buf->size = sizeof (BITMAPINFOHEADER);
+ memcpy (buf->content, &bih, sizeof (xine_bmiheader));
+ buf->size = sizeof (xine_bmiheader);
buf->type = this->buf_types[stream_num];
this->video_fifo->put (this->video_fifo, buf);
diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c
index 3d0f010e7..526e9a4c1 100644
--- a/src/demuxers/demux_qt.c
+++ b/src/demuxers/demux_qt.c
@@ -30,7 +30,7 @@
* build_frame_table
* free_qt_info
*
- * $Id: demux_qt.c,v 1.36 2002/06/03 12:43:22 f1rmb Exp $
+ * $Id: demux_qt.c,v 1.37 2002/06/03 13:31:13 miguelfreitas Exp $
*
*/
@@ -95,21 +95,6 @@ typedef unsigned int qt_atom;
#define VALID_ENDS "mov,mp4,qt"
-/* still needed, though it shouldn't be... */
-typedef struct {
- long biSize;
- long biWidth;
- long biHeight;
- short biPlanes;
- short biBitCount;
- long biCompression;
- long biSizeImage;
- long biXPelsPerMeter;
- long biYPelsPerMeter;
- long biClrUsed;
- long biClrImportant;
-} BITMAPINFOHEADER;
-
/* these are things that can go wrong */
typedef enum {
QT_OK,
@@ -252,7 +237,7 @@ typedef struct {
int status;
qt_info *qt;
- BITMAPINFOHEADER bih;
+ xine_bmiheader bih;
unsigned int current_frame;
unsigned int last_frame;
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-08 03:37:01 +0000