[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec dv.c,1.82,1.83

[Roman Shaposhnick]

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

Modified Files:
	dv.c 
Log Message:
I still don't think this should be here. Note: without this code DV encoder
will accept incorrect pix_fmt's and such, but decoder will work much better
with containers not setting the same attributes. It seems like there will
be a generic mechanism for checking such constraints, but if not I can always
resurrect this check for *encoder* only.



Index: dv.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/dv.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- dv.c	6 Mar 2006 08:54:32 -0000	1.82
+++ dv.c	6 Mar 2006 09:54:09 -0000	1.83
@@ -241,16 +241,6 @@
     /* XXX: do it only for constant case */
     dv_build_unquantize_tables(s, dsp.idct_permutation);
 
-    /* FIXME: I really don't think this should be here */
-    s->sys = dv_codec_profile(avctx);
-    if(!s->sys) {
-        av_log(avctx, AV_LOG_ERROR, "Cannot determine type of DV output stream\n");
-        return -EINVAL;
-    }
-    avctx->pix_fmt = s->sys->pix_fmt;
-    avctx->bit_rate = av_rescale(s->sys->frame_size * 8,
-                                 s->sys->frame_rate,
-                                 s->sys->frame_rate_base);
     avctx->coded_frame = &s->picture;
     s->avctx= avctx;