diff avcodec.h @ 573:b0f52172f4c5 libavcodec

beos/mov/adpcm patch by Fran���ois Revol <revol at free dot fr> * Some BeOS fixes: - errno stuff - nanosleep() replacement - added a doc/README.beos * mov reader still has problems with most videos (skips many chunks), - It should now read .mov files with zlib-compressed moov headers (aka cmov) - added SVQ1 support. - removed mapping 'raw ' and 'yuv2' to h263, was my mistake. - added IMA4 support. (tested) - fixed frame rate (it reported 0 fps or something before) - extended file probing ('wide' and 'free' atoms) - improved .mov/.mp4 detection (or so I think) * adpcm * added zlib support, with header file and lib check

--- a/avcodec.h	Fri Jul 19 22:23:40 2002 +0000
+++ b/avcodec.h	Sat Jul 20 20:05:50 2002 +0000
@@ -5,8 +5,8 @@
 
 #define LIBAVCODEC_VERSION_INT 0x000406
 #define LIBAVCODEC_VERSION     "0.4.6"
-#define LIBAVCODEC_BUILD       4617
-#define LIBAVCODEC_BUILD_STR   "4617"
+#define LIBAVCODEC_BUILD       4618
+#define LIBAVCODEC_BUILD_STR   "4618"
 
 enum CodecID {
     CODEC_ID_NONE, 
@@ -37,6 +37,11 @@
     CODEC_ID_PCM_U8,
     CODEC_ID_PCM_MULAW,
     CODEC_ID_PCM_ALAW,
+
+    /* various adpcm codecs */
+    CODEC_ID_ADPCM_IMA_QT,
+    CODEC_ID_ADPCM_IMA_WAV,
+    CODEC_ID_ADPCM_MS,
 };
 #define CODEC_ID_MSMPEG4 CODEC_ID_MSMPEG4V3
 
@@ -263,6 +268,7 @@
     int has_b_frames; // is 1 if the decoded stream contains b frames
     int dr_uvstride;
     int dr_ip_buffer_count;
+    int block_align; /* currently only for adpcm codec in wav/avi */
 
     //FIXME this should be reordered after kabis API is finished ...
     /*
@@ -286,7 +292,7 @@
 	    ul_res0,ul_res1,ul_res2,ul_res3,ul_res4,ul_res5,
 	    ul_res6,ul_res7,ul_res8,ul_res9,ul_res10,ul_res11,ul_res12;
     unsigned int
-	    ui_res0,ui_res1,ui_res2;
+	    ui_res0,ui_res1;
     unsigned short int
 	    us_res0,us_res1,us_res2,us_res3,us_res4,us_res5,
 	    us_res6,us_res7,us_res8,us_res9,us_res10,us_res11,us_res12;
@@ -376,6 +382,12 @@
 PCM_CODEC(CODEC_ID_PCM_ALAW, pcm_alaw);
 PCM_CODEC(CODEC_ID_PCM_MULAW, pcm_mulaw);
 
+/* adpcm codecs */
+
+PCM_CODEC(CODEC_ID_ADPCM_IMA_QT, adpcm_ima_qt);
+PCM_CODEC(CODEC_ID_ADPCM_IMA_WAV, adpcm_ima_wav);
+PCM_CODEC(CODEC_ID_ADPCM_MS, adpcm_ms);
+
 #undef PCM_CODEC
 
 /* dummy raw video codec */