[vlc-commits] avformat: put_flush_packet was renamed some time ago ( cherry picked from commit a6ebc7d7eb2231939ec94dd5a94bf819fb7c2086)

Rafaël Carré git at videolan.org
Sun Mar 4 22:42:03 CET 2012


vlc/vlc-2.0 | branch: master | Rafaël Carré <funman at videolan.org> | Sat Mar  3 00:03:08 2012 +0900| [2769212fa98f8098007c2d587f9715dcf5bf4add] | committer: Rafaël Carré

avformat: put_flush_packet was renamed some time ago (cherry picked from commit a6ebc7d7eb2231939ec94dd5a94bf819fb7c2086)

Signed-off-by: KO Myung-Hun <komh at chollian.net>
Signed-off-by: Rafaël Carré <funman at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=2769212fa98f8098007c2d587f9715dcf5bf4add
---

 modules/demux/avformat/mux.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/demux/avformat/mux.c b/modules/demux/avformat/mux.c
index eea867e..b30392c 100644
--- a/modules/demux/avformat/mux.c
+++ b/modules/demux/avformat/mux.c
@@ -39,6 +39,11 @@
 #include "../../codec/avcodec/avcodec.h"
 #include "../../codec/avcodec/avutil.h"
 
+/* Support for deprecated APIs */
+#if LIBAVFORMAT_VERSION_INT < ((52<<16)+(105<<8)+0)
+# define avio_flush put_flush_packet
+#endif
+
 //#define AVFORMAT_DEBUG 1
 
 static const char *const ppsz_mux_options[] = {
@@ -358,9 +363,9 @@ static int Mux( sout_mux_t *p_mux )
         }
 
 #if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(0<<8)+0)
-        put_flush_packet( p_sys->oc->pb );
+        avio_flush( p_sys->oc->pb );
 #else
-        put_flush_packet( &p_sys->oc->pb );
+        avio_flush( &p_sys->oc->pb );
 #endif
         p_sys->b_write_header = false;
     }



More information about the vlc-commits mailing list