Browse Source

avformat/vobsub: remove pointless FAIL macro.

tags/n2.3
Clément Bœsch 11 years ago
parent
commit
6a3a7d7af1
1 changed files with 2 additions and 4 deletions
  1. +2
    -4
      libavformat/mpeg.c

+ 2
- 4
libavformat/mpeg.c View File

@@ -828,8 +828,6 @@ end:
return ret; return ret;
} }


#define FAIL(r) do { ret = r; goto fail; } while (0)

static int vobsub_read_packet(AVFormatContext *s, AVPacket *pkt) static int vobsub_read_packet(AVFormatContext *s, AVPacket *pkt)
{ {
MpegDemuxContext *vobsub = s->priv_data; MpegDemuxContext *vobsub = s->priv_data;
@@ -878,7 +876,7 @@ static int vobsub_read_packet(AVFormatContext *s, AVPacket *pkt)
if (ret < 0) { if (ret < 0) {
if (pkt->size) // raise packet even if incomplete if (pkt->size) // raise packet even if incomplete
break; break;
FAIL(ret);
goto fail;
} }
to_read = ret & 0xffff; to_read = ret & 0xffff;
new_pos = avio_tell(pb); 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); ret = av_grow_packet(pkt, to_read);
if (ret < 0) if (ret < 0)
FAIL(ret);
goto fail;


n = avio_read(pb, pkt->data + (pkt->size - to_read), to_read); n = avio_read(pb, pkt->data + (pkt->size - to_read), to_read);
if (n < to_read) if (n < to_read)


Loading…
Cancel
Save