Commit 4720da2c authored by michael's avatar michael

avio patch by (Gildas Bazin <gbazin at altern dot org>)


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@2783 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent f4f48664
...@@ -429,7 +429,7 @@ int url_fdopen(ByteIOContext *s, URLContext *h) ...@@ -429,7 +429,7 @@ int url_fdopen(ByteIOContext *s, URLContext *h)
return -ENOMEM; return -ENOMEM;
if (init_put_byte(s, buffer, buffer_size, if (init_put_byte(s, buffer, buffer_size,
(h->flags & URL_WRONLY) != 0, h, (h->flags & URL_WRONLY || h->flags & URL_RDWR), h,
url_read_packet, url_write_packet, url_seek_packet) < 0) { url_read_packet, url_write_packet, url_seek_packet) < 0) {
av_free(buffer); av_free(buffer);
return -EIO; return -EIO;
...@@ -547,7 +547,8 @@ int url_fget_max_packet_size(ByteIOContext *s) ...@@ -547,7 +547,8 @@ int url_fget_max_packet_size(ByteIOContext *s)
int url_open_buf(ByteIOContext *s, uint8_t *buf, int buf_size, int flags) int url_open_buf(ByteIOContext *s, uint8_t *buf, int buf_size, int flags)
{ {
return init_put_byte(s, buf, buf_size, return init_put_byte(s, buf, buf_size,
(flags & URL_WRONLY) != 0, NULL, NULL, NULL, NULL); (flags & URL_WRONLY || flags & URL_RDWR),
NULL, NULL, NULL, NULL);
} }
/* return the written or read size */ /* return the written or read size */
......
...@@ -37,7 +37,9 @@ static int file_open(URLContext *h, const char *filename, int flags) ...@@ -37,7 +37,9 @@ static int file_open(URLContext *h, const char *filename, int flags)
strstart(filename, "file:", &filename); strstart(filename, "file:", &filename);
if (flags & URL_WRONLY) { if (flags & URL_RDWR) {
access = O_CREAT | O_TRUNC | O_RDWR;
} else if (flags & URL_WRONLY) {
access = O_CREAT | O_TRUNC | O_WRONLY; access = O_CREAT | O_TRUNC | O_WRONLY;
} else { } else {
access = O_RDONLY; access = O_RDONLY;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment