ffmpeg | branch: master | Timothy Gu <timothyg...@gmail.com> | Wed May 13 
16:23:09 2015 -0700| [eaeb63219872984a7cc2b6fab45584bc0abb51d5] | committer: 
Michael Niedermayer

nutdec: Remove unused label

Added in 361702660d2c37a63b7d6381d39e1e1de8405260. Modified version that
doesn't use this label merged in 55231323b0fdc84a529418d673148cf1f3157229,
thus obsoleting this label.

Signed-off-by: Michael Niedermayer <michae...@gmx.at>

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

 libavformat/nutdec.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index 9c017e0..88a2d32 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -822,10 +822,8 @@ static int nut_read_header(AVFormatContext *s)
 
     ff_metadata_conv_ctx(s, NULL, ff_nut_metadata_conv);
 
-end:
-    if (ret < 0)
-        nut_read_close(s);
-    return FFMIN(ret, 0);
+    return 0;
+
 fail:
     nut_read_close(s);
 

_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to