[vlc-commits] avformat: put_flush_packet was renamed some time ago
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:05:02 2012 -0500| [a6ebc7d7eb2231939ec94dd5a94bf819fb7c2086] | committer: Rafaël Carré
avformat: put_flush_packet was renamed some time ago
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a6ebc7d7eb2231939ec94dd5a94bf819fb7c2086
---
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 6e07236..61fd2a4 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[] = {
@@ -365,9 +370,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