[vlc-commits] Revert "avformat: don't mark buffer as need to be writable, as we don' t write into it directly"

Rafaël Carré git at videolan.org
Wed Jun 26 22:58:57 CEST 2013


vlc | branch: master | Rafaël Carré <funman at videolan.org> | Wed Jun 26 22:57:47 2013 +0200| [95d8d6551f734fb51fea0b9e3cb39aebf6aee848] | committer: Rafaël Carré

Revert "avformat: don't mark buffer as need to be writable, as we don't write into it directly"

This reverts commit 75890fb5e9086d91e92ca6d9abb13a307278238d.

This caused infinite loops in aviobuf when muxing to mkv.
write_flag seems to mean "mux" versus "demux".
The real meaning might be lost on us for lack of a libavformat documentation translator.

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

 modules/demux/avformat/mux.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/demux/avformat/mux.c b/modules/demux/avformat/mux.c
index 58109f9..aef7388 100644
--- a/modules/demux/avformat/mux.c
+++ b/modules/demux/avformat/mux.c
@@ -120,7 +120,7 @@ int OpenMux( vlc_object_t *p_this )
 
     p_sys->io = avio_alloc_context(
         p_sys->io_buffer, p_sys->io_buffer_size,
-        0, p_mux, NULL, IOWrite, IOSeek );
+        1, p_mux, NULL, IOWrite, IOSeek );
 
     p_sys->oc->pb = p_sys->io;
     p_sys->oc->nb_streams = 0;



More information about the vlc-commits mailing list