summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2005-07-16 14:39:31 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2005-07-16 14:39:31 +0000
commit4fd68a72893cb64f788ac8ba8aaff1f484a4ac71 (patch)
tree2b84a02ea151c45ecbf47c9f2097c9a1465eeab0
parent53f3d5be338203c02f07297e909fe252ac1e7e0c (diff)
downloadgst-libav-4fd68a72893cb64f788ac8ba8aaff1f484a4ac71.tar.gz
ext/ffmpeg/gstffmpegprotocol.c: Strip off private flags from context value (#310054).
Original commit message from CVS: Reviewed by: Ronald S. Bultje <rbultje@ronald.bitfreak.net> * ext/ffmpeg/gstffmpegprotocol.c: (gst_ffmpegdata_open): Strip off private flags from context value (#310054).
-rw-r--r--ChangeLog7
-rw-r--r--ext/ffmpeg/gstffmpegprotocol.c1
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index aba3e7a..e63d133 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-16 daniel fischer <dan@f3c.com>
+
+ Reviewed by: Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+
+ * ext/ffmpeg/gstffmpegprotocol.c: (gst_ffmpegdata_open):
+ Strip off private flags from context value (#310054).
+
2005-07-11 Luca Ognibene <luogni@tin.it>
* ext/ffmpeg/gstffmpegdec.c (struct _GstFFMpegDec)
diff --git a/ext/ffmpeg/gstffmpegprotocol.c b/ext/ffmpeg/gstffmpegprotocol.c
index 9ca1013..b10178c 100644
--- a/ext/ffmpeg/gstffmpegprotocol.c
+++ b/ext/ffmpeg/gstffmpegprotocol.c
@@ -56,6 +56,7 @@ gst_ffmpegdata_open (URLContext * h, const char *filename, int flags)
info->set_streamheader = flags & GST_FFMPEG_URL_STREAMHEADER;
flags &= ~GST_FFMPEG_URL_STREAMHEADER;
+ h->flags &= ~GST_FFMPEG_URL_STREAMHEADER;
/* we don't support R/W together */
if (flags != URL_RDONLY && flags != URL_WRONLY) {