aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPanagiotis Issaris <takis.issaris@uhasselt.be>2007-03-05 14:26:50 +0000
committerPanagiotis Issaris <takis.issaris@uhasselt.be>2007-03-05 14:26:50 +0000
commitc306748c2951ffabc662f23c98e48b7db5267df6 (patch)
tree7023398b6c4fd993856d5d6a848e987e484ad7e6
parenta8c5ab270759c2e83ce7e5f85b9f9a1397e76e96 (diff)
downloadffmpeg-c306748c2951ffabc662f23c98e48b7db5267df6.tar.gz
Move avio.h's url_get_max_packet_size() comment from source to header file.
Remove the comment section of url_set_interrupt_cb() which was a duplicate as it appeared identically in both the header and the source file. Originally committed as revision 8259 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/avio.c14
-rw-r--r--libavformat/avio.h9
2 files changed, 9 insertions, 14 deletions
diff --git a/libavformat/avio.c b/libavformat/avio.c
index 4d432a2c08..a22bd22f3c 100644
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@ -162,14 +162,6 @@ offset_t url_filesize(URLContext *h)
return size;
}
-/*
- * Return the maximum packet size associated to packetized file
- * handle. If the file is not packetized (stream like http or file on
- * disk), then 0 is returned.
- *
- * @param h file handle
- * @return maximum packet size in bytes
- */
int url_get_max_packet_size(URLContext *h)
{
return h->max_packet_size;
@@ -186,12 +178,6 @@ static int default_interrupt_cb(void)
return 0;
}
-/**
- * The callback is called in blocking functions to test regulary if
- * asynchronous interruption is needed. AVERROR(EINTR) is returned
- * in this case by the interrupted function. 'NULL' means no interrupt
- * callback is given.
- */
void url_set_interrupt_cb(URLInterruptCB *interrupt_cb)
{
if (!interrupt_cb)
diff --git a/libavformat/avio.h b/libavformat/avio.h
index 898e0e8b9f..4b2a9f7e58 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -61,6 +61,15 @@ offset_t url_seek(URLContext *h, offset_t pos, int whence);
int url_close(URLContext *h);
int url_exist(const char *filename);
offset_t url_filesize(URLContext *h);
+
+/*
+ * Return the maximum packet size associated to packetized file
+ * handle. If the file is not packetized (stream like http or file on
+ * disk), then 0 is returned.
+ *
+ * @param h file handle
+ * @return maximum packet size in bytes
+ */
int url_get_max_packet_size(URLContext *h);
void url_get_filename(URLContext *h, char *buf, int buf_size);