summaryrefslogtreecommitdiffstats
path: root/libmpdemux/muxer_lavf.c
diff options
context:
space:
mode:
authormichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-07-18 00:10:09 +0000
committermichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-07-18 00:10:09 +0000
commit57b7f68b800447f834ae1b97de633987255b1898 (patch)
tree67ee6f8b0bf0230a62ab0811abecbd6f1997e857 /libmpdemux/muxer_lavf.c
parent096500035ddd4c51a10b30d6c00f44c703da7ef4 (diff)
downloadmpv-57b7f68b800447f834ae1b97de633987255b1898.tar.bz2
mpv-57b7f68b800447f834ae1b97de633987255b1898.tar.xz
LIBAVFORMAT_BUILD >= 4629
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16002 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/muxer_lavf.c')
-rw-r--r--libmpdemux/muxer_lavf.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/libmpdemux/muxer_lavf.c b/libmpdemux/muxer_lavf.c
index 10c88c0128..901746a787 100644
--- a/libmpdemux/muxer_lavf.c
+++ b/libmpdemux/muxer_lavf.c
@@ -130,7 +130,11 @@ static muxer_stream_t* lavf_new_stream(muxer_t *muxer, int type)
}
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 @@ static void fix_parameters(muxer_stream_t *stream)
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)
{