[vlc-commits] avformat: prefer avformat_new_stream() over av_new_stream()

Rafaël Carré git at videolan.org
Sun Jan 29 06:32:05 CET 2012


vlc | branch: master | Rafaël Carré <funman at videolan.org> | Sun Jan 29 00:18:18 2012 -0500| [5dbdccf2fd7829a8a0fb3ccae65ed17f71c7078a] | committer: Rafaël Carré

avformat: prefer avformat_new_stream() over av_new_stream()

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5dbdccf2fd7829a8a0fb3ccae65ed17f71c7078a
---

 modules/demux/avformat/mux.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/modules/demux/avformat/mux.c b/modules/demux/avformat/mux.c
index 61fd2a4..716830b 100644
--- a/modules/demux/avformat/mux.c
+++ b/modules/demux/avformat/mux.c
@@ -218,7 +218,11 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
         return VLC_EGENERIC;
     }
 
+#if (LIBAVFORMAT_VERSION_INT >= ((53<<16)+(10<<8)+0))
+    stream = avformat_new_stream( p_sys->oc, NULL);
+#else
     stream = av_new_stream( p_sys->oc, p_sys->oc->nb_streams);
+#endif
     if( !stream )
     {
         free( p_input->p_sys );



More information about the vlc-commits mailing list