[MPlayer-cvslog] CVS: main/libmpdemux muxer_lavf.c,1.8,1.9
Michael Niedermayer CVS
syncmail at mplayerhq.hu
Mon Jul 18 02:10:11 CEST 2005
CVS change done by Michael Niedermayer CVS
Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv24759
Modified Files:
muxer_lavf.c
Log Message:
LIBAVFORMAT_BUILD >= 4629
Index: muxer_lavf.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/muxer_lavf.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- muxer_lavf.c 17 May 2005 21:44:28 -0000 1.8
+++ muxer_lavf.c 18 Jul 2005 00:10:09 -0000 1.9
@@ -130,7 +130,11 @@
}
spriv->avstream->stream_copy = 1;
+#if LIBAVFORMAT_BUILD >= 4629
+ ctx = spriv->avstream->codec;
+#else
ctx = &(spriv->avstream->codec);
+#endif
ctx->codec_id = muxer->avih.dwStreams;
switch(type)
{
@@ -155,7 +159,11 @@
muxer_stream_priv_t *spriv = (muxer_stream_priv_t *) stream->priv;
AVCodecContext *ctx;
+#if LIBAVFORMAT_BUILD >= 4629
+ ctx = spriv->avstream->codec;
+#else
ctx = &(spriv->avstream->codec);
+#endif
if(stream->type == MUXER_TYPE_AUDIO)
{
More information about the MPlayer-cvslog
mailing list