[FFmpeg-cvslog] avformat/vobsub: remove pointless FAIL macro.

Clément Bœsch git at videolan.org
Thu May 1 16:22:12 CEST 2014


ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Thu May  1 16:16:38 2014 +0200| [6a3a7d7af1b650ea3ca21bb71b32648c12c01403] | committer: Clément Bœsch

avformat/vobsub: remove pointless FAIL macro.

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

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

diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index e07e41d..d0b1527 100644
--- a/libavformat/mpeg.c
+++ b/libavformat/mpeg.c
@@ -828,8 +828,6 @@ end:
     return ret;
 }
 
-#define FAIL(r) do { ret = r; goto fail; } while (0)
-
 static int vobsub_read_packet(AVFormatContext *s, AVPacket *pkt)
 {
     MpegDemuxContext *vobsub = s->priv_data;
@@ -878,7 +876,7 @@ static int vobsub_read_packet(AVFormatContext *s, AVPacket *pkt)
         if (ret < 0) {
             if (pkt->size) // raise packet even if incomplete
                 break;
-            FAIL(ret);
+            goto fail;
         }
         to_read = ret & 0xffff;
         new_pos = avio_tell(pb);
@@ -895,7 +893,7 @@ static int vobsub_read_packet(AVFormatContext *s, AVPacket *pkt)
 
         ret = av_grow_packet(pkt, to_read);
         if (ret < 0)
-            FAIL(ret);
+            goto fail;
 
         n = avio_read(pb, pkt->data + (pkt->size - to_read), to_read);
         if (n < to_read)



More information about the ffmpeg-cvslog mailing list