[SCM] libav/experimental: avformat: Mark argument in av_{i|o}format_next/ffurl_protocol_next as const

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Aug 10 16:04:02 UTC 2014


The following commit has been merged in the experimental branch:
commit ec4f04da1a3462dac429b9d15dee5f027309da15
Author: Diego Biurrun <diego at biurrun.de>
Date:   Sat Jul 26 02:47:41 2014 -0700

    avformat: Mark argument in av_{i|o}format_next/ffurl_protocol_next as const

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 2bc1df9..3520506 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1286,14 +1286,14 @@ int avformat_network_deinit(void);
  * if f is non-NULL, returns the next registered input format after f
  * or NULL if f is the last one.
  */
-AVInputFormat  *av_iformat_next(AVInputFormat  *f);
+AVInputFormat  *av_iformat_next(const AVInputFormat  *f);
 
 /**
  * If f is NULL, returns the first registered output format,
  * if f is non-NULL, returns the next registered output format after f
  * or NULL if f is the last one.
  */
-AVOutputFormat *av_oformat_next(AVOutputFormat *f);
+AVOutputFormat *av_oformat_next(const AVOutputFormat *f);
 
 /**
  * Allocate an AVFormatContext.
diff --git a/libavformat/avio.c b/libavformat/avio.c
index fe42974..80863da 100644
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@ -32,7 +32,7 @@
 
 static URLProtocol *first_protocol = NULL;
 
-URLProtocol *ffurl_protocol_next(URLProtocol *prev)
+URLProtocol *ffurl_protocol_next(const URLProtocol *prev)
 {
     return prev ? prev->next : first_protocol;
 }
diff --git a/libavformat/format.c b/libavformat/format.c
index 3a510cd..7e9ca33 100644
--- a/libavformat/format.c
+++ b/libavformat/format.c
@@ -32,7 +32,7 @@ static AVInputFormat *first_iformat = NULL;
 /** head of registered output format linked list */
 static AVOutputFormat *first_oformat = NULL;
 
-AVInputFormat *av_iformat_next(AVInputFormat *f)
+AVInputFormat *av_iformat_next(const AVInputFormat *f)
 {
     if (f)
         return f->next;
@@ -40,7 +40,7 @@ AVInputFormat *av_iformat_next(AVInputFormat *f)
         return first_iformat;
 }
 
-AVOutputFormat *av_oformat_next(AVOutputFormat *f)
+AVOutputFormat *av_oformat_next(const AVOutputFormat *f)
 {
     if (f)
         return f->next;
diff --git a/libavformat/url.h b/libavformat/url.h
index ff1e21b..40be4d5 100644
--- a/libavformat/url.h
+++ b/libavformat/url.h
@@ -238,7 +238,7 @@ int ff_check_interrupt(AVIOInterruptCB *cb);
  *
  * @param prev result of the previous call to this functions or NULL.
  */
-URLProtocol *ffurl_protocol_next(URLProtocol *prev);
+URLProtocol *ffurl_protocol_next(const URLProtocol *prev);
 
 /* udp.c */
 int ff_udp_set_remote_url(URLContext *h, const char *uri);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list