[libav-devel] [PATCH 6/9] avio: avio_ prefix for url_set_interrupt_cb.

[Anton Khirnov]

---
 ffmpeg.c           |    4 ++--
 ffplay.c           |    4 ++--
 libavformat/avio.c |    6 +++++-
 libavformat/avio.h |    3 ++-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 5e50db3..fced345 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2443,7 +2443,7 @@ static int transcode(AVFormatContext **output_files,
 #else
         fprintf(stderr, "Press ctrl-c to stop encoding\n");
 #endif
-        url_set_interrupt_cb(decode_interrupt_cb);
+        avio_set_interrupt_cb(decode_interrupt_cb);
     }
     term_init();
 
@@ -4281,7 +4281,7 @@ int main(int argc, char **argv)
 
 #if HAVE_ISATTY
     if(isatty(STDIN_FILENO))
-        url_set_interrupt_cb(decode_interrupt_cb);
+        avio_set_interrupt_cb(decode_interrupt_cb);
 #endif
 
     init_opts();
diff --git a/ffplay.c b/ffplay.c
index ddd2c4d..bd8a985 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -2393,7 +2393,7 @@ static int decode_thread(void *arg)
     is->subtitle_stream = -1;
 
     global_video_state = is;
-    url_set_interrupt_cb(decode_interrupt_cb);
+    avio_set_interrupt_cb(decode_interrupt_cb);
 
     memset(ap, 0, sizeof(*ap));
 
@@ -2612,7 +2612,7 @@ static int decode_thread(void *arg)
         av_close_input_file(is->ic);
         is->ic = NULL; /* safety */
     }
-    url_set_interrupt_cb(NULL);
+    avio_set_interrupt_cb(NULL);
 
     if (ret != 0) {
         SDL_Event event;
diff --git a/libavformat/avio.c b/libavformat/avio.c
index b3c44f4..efb9d55 100644
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@ -223,6 +223,10 @@ void url_get_filename(URLContext *h, char *buf, int 
buf_size)
 {
     av_strlcpy(buf, h->filename, buf_size);
 }
+void url_set_interrupt_cb(URLInterruptCB *interrupt_cb)
+{
+    avio_set_interrupt_cb(interrupt_cb);
+}
 #endif
 
 #define URL_SCHEME_CHARS                        \
@@ -388,7 +392,7 @@ static int default_interrupt_cb(void)
     return 0;
 }
 
-void url_set_interrupt_cb(URLInterruptCB *interrupt_cb)
+void avio_set_interrupt_cb(URLInterruptCB *interrupt_cb)
 {
     if (!interrupt_cb)
         interrupt_cb = default_interrupt_cb;
diff --git a/libavformat/avio.h b/libavformat/avio.h
index a3f0331..e854266 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -117,6 +117,7 @@ attribute_deprecated void url_get_filename(URLContext *h, 
char *buf, int buf_siz
 attribute_deprecated int av_url_read_pause(URLContext *h, int pause);
 attribute_deprecated int64_t av_url_read_seek(URLContext *h, int stream_index,
                                               int64_t timestamp, int flags);
+attribute_deprecated void url_set_interrupt_cb(URLInterruptCB *interrupt_cb);
 #endif
 
 /**
@@ -131,7 +132,7 @@ int url_exist(const char *url);
  * in this case by the interrupted function. 'NULL' means no interrupt
  * callback is given.
  */
-void url_set_interrupt_cb(URLInterruptCB *interrupt_cb);
+void avio_set_interrupt_cb(URLInterruptCB *interrupt_cb);
 
 #if FF_API_OLD_AVIO
 /* not implemented */
-- 
1.7.4.1

_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel