vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Thu Feb 5 20:11:47 2015 +0200| [040e285b8527b157fe7c5a9a6e615d1d1ccf7a4a] | committer: Rémi Denis-Courmont
avio: remove interrupt callback for output sout_access_out objects are always alive. This was a no-op. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=040e285b8527b157fe7c5a9a6e615d1d1ccf7a4a --- modules/access/avio.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/modules/access/avio.c b/modules/access/avio.c index 47615e6..50ef585 100644 --- a/modules/access/avio.c +++ b/modules/access/avio.c @@ -70,7 +70,7 @@ static int OutSeek (sout_access_out_t *, off_t); static int UrlInterruptCallback(void *access) { - return !vlc_object_alive((vlc_object_t*)access); + return !vlc_object_alive((access_t *)access); } struct access_sys_t @@ -233,10 +233,6 @@ int OutOpenAvio(vlc_object_t *object) #if LIBAVFORMAT_VERSION_MAJOR < 54 ret = avio_open(&sys->context, access->psz_path, AVIO_FLAG_WRITE); #else - AVIOInterruptCB cb = { - .callback = UrlInterruptCallback, - .opaque = access, - }; AVDictionary *options = NULL; char *psz_opts = var_InheritString(access, "sout-avio-options"); if (psz_opts && *psz_opts) { @@ -244,7 +240,7 @@ int OutOpenAvio(vlc_object_t *object) free(psz_opts); } ret = avio_open2(&sys->context, access->psz_path, AVIO_FLAG_WRITE, - &cb, &options); + NULL, &options); AVDictionaryEntry *t = NULL; while ((t = av_dict_get(options, "", t, AV_DICT_IGNORE_SUFFIX))) msg_Err( access, "unknown option \"%s\"", t->key ); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
