* NEWS: small corrections

* modules/codec/ffmpeg: I had disabled IV31 support on intel instead of on ppc
* modules/codec/quicktime.c: cosmetic fix

diff --git a/NEWS b/NEWS
index 36ce87672d62b49be9507f7819ff052a22294520..ad1b9432c9b5037dd18fb83a90230a29af393e6b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-$Id: NEWS,v 1.49 2003/06/15 01:23:31 massiot Exp $
+$Id: NEWS,v 1.50 2003/06/15 22:32:06 hartman Exp $
 
 Changes between 0.5.3 and 0.6.0:
 ---------------------------------
@@ -41,7 +41,7 @@ Miscellaneous:
  * You can set your language in the prefences
  * New video chroma conversion module using ffmpeg
  * Added a Gentoo ebuild file to the distribution
- * Added a new smaller subtitles font + scripts to generate your own
+ * Added a new smaller subtitles font (now the default) + scripts to generate your own
 
 UNIX ports:
  * Basic support for the X11 Xinerama extension.
@@ -51,7 +51,7 @@ Mac OS X port:
  * When you add several items to the playlist, they are sorted alphabetically.
  * New about panel and revamped preferences panel.
  * Fixed the deinterlace menu.
- * Float on top and a Transparency option for video out.
+ * Float on top, Fit to Screen and a Transparency option for video out.
  * New output dialog for transcode and display while stream capabilities.
  * New icons by Davor Orel.
  * New audio resampler. Should make VLC much faster.

diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c
index 2d3f492b314a5a05984c6f12dc58054ec08f85c7..d7d756b85715214942ad8a805e97bef2e56cf6ec 100644 (file)
--- a/modules/codec/ffmpeg/ffmpeg.c
+++ b/modules/codec/ffmpeg/ffmpeg.c
@@ -2,7 +2,7 @@
  * ffmpeg.c: video decoder using ffmpeg library
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: ffmpeg.c,v 1.42 2003/06/14 15:43:39 gbazin Exp $
+ * $Id: ffmpeg.c,v 1.43 2003/06/15 22:32:06 hartman Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -627,8 +627,8 @@ static int ffmpeg_GetFfmpegCodec( vlc_fourcc_t i_fourcc,
             psz_name ="Windows Media Audio 2";
             break;
 
-#if( ( LIBAVCODEC_BUILD >= 4663 ) && ( defined( WORDS_BIGENDIAN ) ) )
-        /* Quality of this decoder on ppc is not gooed */
+#if( ( LIBAVCODEC_BUILD >= 4663 ) && ( !defined( WORDS_BIGENDIAN ) ) )
+        /* Quality of this decoder on ppc is not good */
        case FOURCC_IV31:
         case FOURCC_iv31:
         case FOURCC_IV32:
@@ -653,7 +653,7 @@ static int ffmpeg_GetFfmpegCodec( vlc_fourcc_t i_fourcc,
             i_cat    = VIDEO_ES;
             i_codec  = CODEC_ID_ASV1;
             psz_name = "Asus V1";
-            break;*/
+            break; */
 #endif
 
         default:

diff --git a/modules/codec/quicktime.c b/modules/codec/quicktime.c
index 7cff47ab5bc192ba1edc256a5ea4b1e566172210..c055a4fee498c7236861f8bdb6a99cc89039f201 100644 (file)
--- a/modules/codec/quicktime.c
+++ b/modules/codec/quicktime.c
@@ -2,7 +2,7 @@
  * quicktime.c: a quicktime decoder that uses the QT library/dll
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: quicktime.c,v 1.6 2003/05/26 14:59:37 hartman Exp $
+ * $Id: quicktime.c,v 1.7 2003/06/15 22:32:06 hartman Exp $
  *
  * Authors: Laurent Aimar <fenrir at via.ecp.fr>
  *          Derk-Jan Hartman <thedj at users.sf.net>
@@ -289,9 +289,7 @@ static int OpenDecoder( vlc_object_t *p_this )
         case VLC_FOURCC('f','l','6','4'): /* 64-bit Floating Point */
         case VLC_FOURCC('i','n','2','4'): /* 24-bit Interger */
         case VLC_FOURCC('i','n','3','2'): /* 32-bit Integer */
-       case 0x31:                              /* MS GSM */
-       case 0x32:                              /* MSN Audio */
-       case 0x0011:                            /* DVI IMA */
+        case 0x0011:                           /* DVI IMA */
        case 0x6D730002:                        /* Microsoft ADPCM-ACM */
        case 0x6D730011:                        /* DVI Intel IMAADPCM-ACM */
 
@@ -455,7 +453,7 @@ static int InitThreadAudio( adec_thread_t *p_dec )
                                          &p_dec->myConverter );
     if( i_error )
     {
-        msg_Dbg( p_dec->p_fifo, "error while SoundConverterOpen = %d", i_error );
+        msg_Err( p_dec->p_fifo, "error while SoundConverterOpen = %d", i_error );
         goto exit_error;
     }