[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec asv1.c, 1.16, 1.17 avcodec.h, 1.391, 1.392 rv10.c, 1.72, 1.73 snow.c, 1.59, 1.60 utils.c, 1.135, 1.136

[Michael Niedermayer CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv22184/libavcodec

Modified Files:
	asv1.c avcodec.h rv10.c snow.c utils.c 
Log Message:
PIX_FMT_NONE and related fixes


Index: asv1.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/asv1.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- asv1.c	26 Mar 2005 23:50:14 -0000	1.16
+++ asv1.c	25 Apr 2005 18:29:05 -0000	1.17
@@ -557,6 +557,7 @@
     common_init(avctx);
     init_vlcs(a);
     ff_init_scantable(a->dsp.idct_permutation, &a->scantable, scantab);
+    avctx->pix_fmt= PIX_FMT_YUV420P;
 
     a->inv_qscale= ((uint8_t*)avctx->extradata)[0];
     if(a->inv_qscale == 0){

Index: avcodec.h
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/avcodec.h,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -d -r1.391 -r1.392
--- avcodec.h	24 Apr 2005 17:21:10 -0000	1.391
+++ avcodec.h	25 Apr 2005 18:29:05 -0000	1.392
@@ -17,7 +17,7 @@
 
 #define FFMPEG_VERSION_INT     0x000409
 #define FFMPEG_VERSION         "0.4.9-pre1"
-#define LIBAVCODEC_BUILD       4752
+#define LIBAVCODEC_BUILD       4753
 
 #define LIBAVCODEC_VERSION_INT FFMPEG_VERSION_INT
 #define LIBAVCODEC_VERSION     FFMPEG_VERSION
@@ -206,6 +206,7 @@
  * to run on the IBM VGA graphics adapter use 6-bit palette components.
  */
 enum PixelFormat {
+    PIX_FMT_NONE= -1,
     PIX_FMT_YUV420P,   ///< Planar YUV 4:2:0 (1 Cr & Cb sample per 2x2 Y samples)
     PIX_FMT_YUV422,    ///< Packed pixel, Y0 Cb Y1 Cr 
     PIX_FMT_RGB24,     ///< Packed pixel, 3 bytes per pixel, RGBRGB...

Index: rv10.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/rv10.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- rv10.c	25 Apr 2005 00:57:48 -0000	1.72
+++ rv10.c	25 Apr 2005 18:29:05 -0000	1.73
@@ -560,7 +560,9 @@
     if(avctx->debug & FF_DEBUG_PICT_INFO){
         av_log(avctx, AV_LOG_DEBUG, "ver:%X ver0:%X\n", avctx->sub_id, avctx->extradata_size >= 4 ? ((uint32_t*)avctx->extradata)[0] : -1);
     }
-    
+
+    avctx->pix_fmt = PIX_FMT_YUV420P;
+
     if (MPV_common_init(s) < 0)
         return -1;
 
@@ -576,8 +578,6 @@
                  rv_chrom_code, 2, 2, 1);
         done = 1;
     }
-    
-    avctx->pix_fmt = PIX_FMT_YUV420P;
 
     return 0;
 }

Index: snow.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/snow.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- snow.c	25 Apr 2005 10:03:01 -0000	1.59
+++ snow.c	25 Apr 2005 18:29:05 -0000	1.60
@@ -3652,6 +3652,8 @@
 {
     SnowContext *s = avctx->priv_data;
     int block_size;
+    
+    avctx->pix_fmt= PIX_FMT_YUV420P;
 
     common_init(avctx);
     

Index: utils.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/utils.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- utils.c	27 Mar 2005 12:19:59 -0000	1.135
+++ utils.c	25 Apr 2005 18:29:05 -0000	1.136
@@ -459,6 +459,7 @@
     s->profile= FF_PROFILE_UNKNOWN;
     s->level= FF_LEVEL_UNKNOWN;
     s->me_penalty_compensation= 256;
+    s->pix_fmt= PIX_FMT_NONE;
     
     s->intra_quant_bias= FF_DEFAULT_QUANT_BIAS;
     s->inter_quant_bias= FF_DEFAULT_QUANT_BIAS;