[SCM] libav/experimental: 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.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:57:22 UTC 2013


The following commit has been merged in the experimental branch:
commit c306748c2951ffabc662f23c98e48b7db5267df6
Author: Panagiotis Issaris <takis.issaris at uhasselt.be>
Date:   Mon Mar 5 14:26:50 2007 +0000

    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

diff --git a/libavformat/avio.c b/libavformat/avio.c
index 4d432a2..a22bd22 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 898e0e8..4b2a9f7 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);
 

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list