diff options
| -rw-r--r-- | src/libffmpeg/xine_decoder.c | 5 | ||||
| -rw-r--r-- | src/libw32dll/w32codec.c | 15 |
2 files changed, 14 insertions, 6 deletions
diff --git a/src/libffmpeg/xine_decoder.c b/src/libffmpeg/xine_decoder.c index ad680724f..e35499055 100644 --- a/src/libffmpeg/xine_decoder.c +++ b/src/libffmpeg/xine_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: xine_decoder.c,v 1.16 2001/10/21 00:18:22 miguelfreitas Exp $ + * $Id: xine_decoder.c,v 1.17 2001/11/07 21:35:01 miguelfreitas Exp $ * * xine decoder plugin using ffmpeg * @@ -103,11 +103,12 @@ static int ff_can_handle (video_decoder_t *this_gen, int buf_type) { buf_type &= 0xFFFF0000; /* ffmpeg currently does not support MSMPEG4 v1/v2 */ + /* there's some problem with I263 too */ return ( buf_type == BUF_VIDEO_MSMPEG4_V3 || /* buf_type == BUF_VIDEO_MSMPEG4_V12 || */ buf_type == BUF_VIDEO_MPEG4 || buf_type == BUF_VIDEO_MJPEG || - buf_type == BUF_VIDEO_I263 || + /* buf_type == BUF_VIDEO_I263 || */ buf_type == BUF_VIDEO_RV10 || buf_type == BUF_VIDEO_JPEG); } diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c index e9f7bcf5f..8a87808ee 100644 --- a/src/libw32dll/w32codec.c +++ b/src/libw32dll/w32codec.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: w32codec.c,v 1.35 2001/11/07 19:41:26 miguelfreitas Exp $ + * $Id: w32codec.c,v 1.36 2001/11/07 21:35:01 miguelfreitas Exp $ * * routines for using w32 codecs * @@ -237,6 +237,8 @@ static char* get_vids_codec_name(w32v_decoder_t *this, case BUF_VIDEO_I263: /* Video in I263 format */ + this->flipped=1; + this->yuv_supported=1; return "i263_32.drv"; case BUF_VIDEO_MSVC: @@ -568,7 +570,7 @@ static char* get_auds_codec_name(w32a_decoder_t *this, int buf_type) { case BUF_AUDIO_MSGSM: return "msgsm32.acm"; case BUF_AUDIO_IMC: - return "icm32.acm"; + return "imc32.acm"; case BUF_AUDIO_LH: return "lhacm.acm"; } @@ -641,7 +643,7 @@ static int w32a_init_audio (w32a_decoder_t *this, acmStreamSize(this->srcstream, in_size, &srcsize, ACM_STREAMSIZEF_SOURCE); printf("w32codec: Audio buffer min. size: %d\n",(int)srcsize); srcsize*=2; - if(!srcsize) + if(srcsize<16384) srcsize=16384; acmStreamSize(this->srcstream, srcsize, (LPDWORD) &this->rec_audio_src_size, @@ -652,7 +654,12 @@ static int w32a_init_audio (w32a_decoder_t *this, free(this->buf); if( this->sample_buf ) free(this->sample_buf); - + + if( this->rec_audio_src_size < 2 * in_fmt->nBlockAlign ) { + this->rec_audio_src_size = 2 * in_fmt->nBlockAlign; + srcsize *= 2; + printf("w32codec: adjusting source buffer size to %d\n", this->rec_audio_src_size); + } this->buf = malloc( 2 * this->rec_audio_src_size ); this->sample_buf = malloc( srcsize ); this->sample_buf_size = srcsize; |