[FFmpeg-cvslog] avformat/avio: make the logic simple

Jun Zhao git at videolan.org
Sun May 6 10:30:47 EEST 2018


ffmpeg | branch: master | Jun Zhao <mypopydev at gmail.com> | Sun Apr  8 08:05:08 2018 +0800| [4d3e9e31356b4d7d4196f271e19679ea65e51223] | committer: Jun Zhao

avformat/avio: make the logic simple

remove the "ret" to make the code simple and generic.

Signed-off-by: Jun Zhao <mypopydev at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4d3e9e31356b4d7d4196f271e19679ea65e51223
---

 libavformat/avio.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavformat/avio.c b/libavformat/avio.c
index 63e82872f7..663789ec02 100644
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@ -663,8 +663,7 @@ int ffurl_shutdown(URLContext *h, int flags)
 
 int ff_check_interrupt(AVIOInterruptCB *cb)
 {
-    int ret;
-    if (cb && cb->callback && (ret = cb->callback(cb->opaque)))
-        return ret;
+    if (cb && cb->callback)
+        return cb->callback(cb->opaque);
     return 0;
 }



More information about the ffmpeg-cvslog mailing list